Skip to content

Commit 7407391

Browse files
Mikejo5000Mikejo5000
committed
resolving merge conflicts
2 parents a86b8ae + 1aaa0dc commit 7407391

File tree

14,642 files changed

+452466
-172020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

14,642 files changed

+452466
-172020
lines changed

‎.acrolinx-config.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main"]
2-
:allowed-filename-matches ["support/"]}
2+
:allowed-filename-matches ["Exchange/" "Microsoft365/" "Office/" "Outlook/" "SharePoint/" "SkypeforBusiness/" "Teams/" "Viva/" "support/"]}

‎.github/workflows/auto_publish.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Auto push to live
2+
3+
on:
4+
# schedule:
5+
# Run at 10:00 a.m., 6:00 p.m., and 2:00 a.m. UTC
6+
# - cron: "0 10 * * *"
7+
# - cron: "0 18 * * *"
8+
# - cron: "0 2 * * *"
9+
10+
workflow_dispatch:
11+
12+
jobs:
13+
auto-push-to-live:
14+
runs-on: ubuntu-latest
15+
if: github.repository == 'MicrosoftDocs/SupportArticles-docs-pr'
16+
permissions:
17+
contents: write
18+
pull-requests: write
19+
20+
steps:
21+
# Checkout the automation branch
22+
- name: Checkout automation branch
23+
uses: actions/checkout@v3
24+
with:
25+
ref: automation # Explicitly check out the automation branch
26+
27+
# Set up Python
28+
- name: Set up Python
29+
uses: actions/setup-python@v4
30+
with:
31+
python-version: '3.12'
32+
33+
# Install dependencies (if any)
34+
- name: Install dependencies
35+
run: |
36+
python -m pip install PyGithub
37+
38+
# Run the Python script
39+
- name: Run script
40+
env:
41+
GITHUB_ACCESS_TOKEN: ${{ secrets.DELAND_PAT }}
42+
run: |
43+
ls scripts
44+
python scripts/auto_push2live.py

‎.github/workflows/create-ado-workitem.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Create Azure DevOps CI on PR
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
jobs:
8+
create-work-item:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Create Azure DevOps Task
12+
env:
13+
ADO_ORG_URL: https://dev.azure.com/KMOps
14+
ADO_PROJECT: ContentExperience
15+
ADO_PAT: ${{ secrets.ADO_PAT }}
16+
run: |
17+
PR_TITLE="${{ github.event.pull_request.title }}"
18+
PR_BODY="${{ github.event.pull_request.body }}"
19+
PR_URL="${{ github.event.pull_request.html_url }}"
20+
21+
curl -X POST \
22+
-H "Content-Type: application/json-patch+json" \
23+
-H "Authorization: Basic $(echo -n ":$ADO_PAT" | base64)" \
24+
$ADO_ORG_URL/$ADO_PROJECT/_apis/wit/workitems/$ExternalCI?api-version=6.0 \
25+
-d '[
26+
{
27+
"op": "add",
28+
"path": "/fields/System.Title",
29+
"value": "PR Opened: '"$PR_TITLE"'"
30+
},
31+
{
32+
"op": "add",
33+
"path": "/fields/System.Description",
34+
"value": "Pull Request URL: '"$PR_URL"'\n\n'"$PR_BODY"'"
35+
}
36+
]'

‎.github/workflows/manage_stale_branches.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Manage stale branches
2+
3+
permissions:
4+
contents: write
5+
pull-requests: read
6+
7+
on:
8+
schedule:
9+
- cron: "0 9 1,28 * *"
10+
workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
if: github.repository == 'MicrosoftDocs/SupportArticles-docs-pr'
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
18+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
RepoBranchSkipList: '[
21+
"automation"
22+
]'
23+
ReportOnly: false
24+
secrets:
25+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/validate_branch_names.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Validate branch names
2+
3+
on:
4+
create
5+
6+
jobs:
7+
validate-branch-name:
8+
if: github.repository == 'MicrosoftDocs/SupportArticles-docs-pr' && startsWith(github.ref, 'refs/heads/')
9+
runs-on: windows-latest
10+
strategy:
11+
fail-fast: true # Prevent retries on failure
12+
steps:
13+
- name: Set git to use long paths
14+
run: git config --system core.longpaths true
15+
- name: Try checkout
16+
uses: actions/checkout@v3

‎.gitignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,17 @@ _repo.*/
88

99
.openpublishing.buildcore.ps1
1010
support/developer/visualstudio/debuggers/media/debug-live-azure-apps-troubleshooting/snapshot-troubleshooting-symbol-settings - Copy.png
11+
/.vs/SupportArticles-docs-pr/FileContentIndex/dd3a4c00-3b2a-4840-80a8-e80ae4e863c9.vsidx
12+
/.vs/SupportArticles-docs-pr/FileContentIndex/2dff6929-ffbf-4dc9-9cbd-c6bbe509f205.vsidx
13+
/.vs/SupportArticles-docs-pr/FileContentIndex/3d798dbe-7969-4c84-8620-b695f3f1320c.vsidx
14+
/.vs/SupportArticles-docs-pr/FileContentIndex/63e626fa-f3af-462c-aedd-f92facc53165.vsidx
15+
/.vs/SupportArticles-docs-pr/FileContentIndex/782f3833-af97-40c8-bd43-eeb32c25605c.vsidx
16+
/.vs/SupportArticles-docs-pr/FileContentIndex/3bfc0f16-1d28-4cf2-b008-5d61e52b32bc.vsidx
17+
/.vs/SupportArticles-docs-pr/FileContentIndex/8542eb62-fe63-4da6-8ec2-3b1ff70b6839.vsidx
18+
/.vs/SupportArticles-docs-pr/FileContentIndex/ecd5aaf6-8848-479e-8f02-f98d0b84cf82.vsidx
19+
/.vs/slnx.sqlite
20+
/.vs/SupportArticles-docs-pr/FileContentIndex/f0dde8da-5ff2-447e-8ee4-9f6b3bf624b1.vsidx
21+
/.vs/SupportArticles-docs-pr/FileContentIndex/d35d01d4-87b6-4423-9cf7-361f16c26e49.vsidx
22+
/.gitignore
23+
*.vsidx
24+
/.gitignore

‎.openpublishing.build.ps1‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.openpublishing.publish.config.json‎

Lines changed: 139 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,133 @@
1717
"Conceptual": "Content"
1818
},
1919
"template_folder": "_themes"
20+
},
21+
{
22+
"docset_name": "SupportArticles-Exchange",
23+
"build_source_folder": "Exchange",
24+
"build_output_subfolder": "SupportArticles-Exchange",
25+
"locale": "en-us",
26+
"monikers": [],
27+
"open_to_public_contributors": true,
28+
"type_mapping": {
29+
"Conceptual": "Content",
30+
"ManagedReference": "Content",
31+
"RestApi": "Content"
32+
},
33+
"build_entry_point": "docs",
34+
"template_folder": "_themes"
35+
},
36+
{
37+
"docset_name": "SupportArticles-M365",
38+
"build_source_folder": "Microsoft365",
39+
"build_output_subfolder": "SupportArticles-M365",
40+
"locale": "en-us",
41+
"monikers": [],
42+
"open_to_public_contributors": true,
43+
"type_mapping": {
44+
"Conceptual": "Content",
45+
"ManagedReference": "Content",
46+
"RestApi": "Content"
47+
},
48+
"build_entry_point": "docs",
49+
"template_folder": "_themes"
50+
},
51+
{
52+
"docset_name": "SupportArticles-Office",
53+
"build_source_folder": "Office",
54+
"build_output_subfolder": "SupportArticles-Office",
55+
"locale": "en-us",
56+
"monikers": [],
57+
"open_to_public_contributors": true,
58+
"type_mapping": {
59+
"Conceptual": "Content",
60+
"ManagedReference": "Content",
61+
"RestApi": "Content"
62+
},
63+
"build_entry_point": "docs",
64+
"template_folder": "_themes"
65+
},
66+
{
67+
"docset_name": "SupportArticles-Outlook",
68+
"build_source_folder": "Outlook",
69+
"build_output_subfolder": "SupportArticles-Outlook",
70+
"locale": "en-us",
71+
"monikers": [],
72+
"open_to_public_contributors": true,
73+
"type_mapping": {
74+
"Conceptual": "Content"
75+
},
76+
"build_entry_point": "docs",
77+
"template_folder": "_themes"
78+
},
79+
{
80+
"docset_name": "SupportArticles-SharePoint",
81+
"build_source_folder": "SharePoint",
82+
"build_output_subfolder": "SupportArticles-SharePoint",
83+
"locale": "en-us",
84+
"monikers": [],
85+
"open_to_public_contributors": true,
86+
"type_mapping": {
87+
"Conceptual": "Content"
88+
},
89+
"build_entry_point": "docs"
90+
},
91+
{
92+
"docset_name": "SupportArticles-SkypeForBusiness",
93+
"build_source_folder": "SkypeForBusiness",
94+
"build_output_subfolder": "SupportArticles-SkypeForBusiness",
95+
"locale": "en-us",
96+
"monikers": [],
97+
"open_to_public_contributors": true,
98+
"type_mapping": {
99+
"Conceptual": "Content",
100+
"ManagedReference": "Content",
101+
"RestApi": "Content"
102+
},
103+
"build_entry_point": "docs",
104+
"template_folder": "_themes"
105+
},
106+
{
107+
"docset_name": "SupportArticles-Teams",
108+
"build_source_folder": "Teams",
109+
"build_output_subfolder": "SupportArticles-Teams",
110+
"locale": "en-us",
111+
"monikers": [],
112+
"open_to_public_contributors": true,
113+
"type_mapping": {
114+
"Conceptual": "Content",
115+
"ManagedReference": "Content",
116+
"RestApi": "Content"
117+
},
118+
"build_entry_point": "docs",
119+
"template_folder": "_themes"
120+
},
121+
{
122+
"docset_name": "SupportArticles-Viva",
123+
"build_source_folder": "Viva",
124+
"build_output_subfolder": "SupportArticles-Viva",
125+
"locale": "en-us",
126+
"monikers": [],
127+
"open_to_public_contributors": true,
128+
"type_mapping": {
129+
"Conceptual": "Content"
130+
},
131+
"build_entry_point": "docs"
20132
}
21133
],
22134
"notification_subscribers": [
23-
"luche@microsoft.com",
24-
"haiyingyu@microsoft.com",
25-
"delhan@microsoft.com",
26-
"Lin.Gen@microsoft.com"
135+
"meerak@microsoft.com",
136+
"aartigoyle@microsoft.com",
137+
"kaushika@microsoft.com",
138+
"jarrettr@microsoft.com"
27139
],
28140
"sync_notification_subscribers": [
29-
"[email protected]",
30-
"[email protected]",
31-
"[email protected]"
141+
"[email protected]",
142+
" [email protected]",
143+
" [email protected]",
144+
" [email protected]",
145+
" [email protected]",
146+
" [email protected]"
32147
],
33148
"branches_to_filter": [],
34149
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/SupportArticles-docs",
@@ -52,6 +167,12 @@
52167
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
53168
"branch": "main",
54169
"branch_mapping": {}
170+
},
171+
{
172+
"path_to_root": "support/reusable-content",
173+
"url": "https://github.com/MicrosoftDocs/reusable-content",
174+
"branch": "main",
175+
"branch_mapping": {}
55176
}
56177
],
57178
"branch_target_mapping": {
@@ -71,7 +192,17 @@
71192
"contribution_branch_mappings": {},
72193
"redirection_files": [
73194
".openpublishing.redirection.json",
74-
".openpublishing.redirection.developer.json"
195+
".openpublishing.redirection.developer.json",
196+
".openpublishing.redirection.exchange.json",
197+
".openpublishing.redirection.microsoft365.json",
198+
".openpublishing.redirection.office.json",
199+
".openpublishing.redirection.outlook.json",
200+
".openpublishing.redirection.SharePoint.json",
201+
".openpublishing.redirection.skypeforbusiness.json",
202+
".openpublishing.redirection.teams.json",
203+
".openpublishing.redirection.viva.json",
204+
"support/azure/.openpublishing.redirection.azure.json",
205+
"support/system-center/.openpublishing.redirection.systemcenter.json"
75206
],
76207
"need_generate_pdf_url_template": true
77208
}

0 commit comments

Comments
 (0)