Skip to content

Commit 3668d00

Browse files
cmcatee-MSFTcmcatee-MSFT
authored
Merge branch 'main' into cmcatee-fix-broken-links
2 parents 9e5f35d + 3b07b47 commit 3668d00

8,270 files changed

Lines changed: 148944 additions & 38814 deletions

File tree

Some content is hidden

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

‎.acrolinx-config.edn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:changed-files-limit 60
22
:allowed-branchname-matches ["main" "release-.*"]
3-
:allowed-filename-matches ["microsoft-365/" "copilot/" "defender/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
3+
:allowed-filename-matches ["microsoft-365/" "copilot/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
44

55
:use-gh-statuses true
66

@@ -39,7 +39,7 @@ For more information about the exception criteria and exception process, see [Mi
3939
4040
Select the total score link to review all feedback on clarity, consistency, tone, brand, terms, spelling, grammar, readability, and inclusive language. _You should fix all spelling errors regardless of your total score_. Fixing spelling errors helps maintain customer trust in overall content quality.
4141
42-
| Article | Total score<br>(Required: 80) | Words + phrases<br>(Brand, terms) | Correctness<br>(Spelling, grammar) | Clarity<br>(Readability) |
42+
| Article | Total score<br>(Required: 80) | Terminology | Spelling and Grammar | Clarity<br>(Readability) |
4343
|---------|:--------------:|:--------------------:|:------:|:---------:|
4444
"
4545

‎.github/workflows/AutoLabelAssign.yml‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
1-
name: Auto label and assign pull requests
1+
name: Assign and label PR
22

33
permissions:
44
pull-requests: write
55
contents: read
6+
actions: read
67

7-
on: [pull_request_target]
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
813

914
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
if: github.repository_owner == 'MicrosoftDocs'
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
1024

11-
auto-label-assign:
12-
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
13-
with:
14-
PayloadJson: ${{ toJSON(github) }}
15-
AutoAssignUsers: 1
16-
AutoLabel: 1
17-
ExcludedUserList: '["user1", "user2"]'
18-
ExcludedBranchList: '["branch1", "branch2"]'
19-
secrets:
20-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
21-
22-
23-
25+
label-assign:
26+
name: Run assign and label
27+
if: github.repository_owner == 'MicrosoftDocs'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
AutoAssignUsers: 1
33+
AutoLabel: 1
34+
ExcludedUserList: '["user1", "user2"]'
35+
ExcludedBranchList: '["branch1", "branch2"]'
36+
secrets:
37+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/AutoLabelMsftContributor.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Auto label Microsoft contributors
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

‎.github/workflows/BackgroundTasks.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
if: github.repository_owner == 'MicrosoftDocs'
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Save payload data
17+
env:
18+
PayloadJson: ${{ toJSON(github) }}
19+
AccessToken: ${{ github.token }}
20+
run: |
21+
mkdir -p ./pr
22+
echo $PayloadJson > ./pr/PayloadJson.json
23+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
24+
- uses: actions/upload-artifact@v4
25+
with:
26+
name: PayloadJson
27+
path: pr/

‎.github/workflows/BuildValidation.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR has no warnings or errors
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
11+
jobs:
12+
13+
build-status:
14+
if: github.repository_owner == 'MicrosoftDocs'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/LiveMergeCheck.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check max/live-compare-merge below
1+
name: PR can merge into branch
22

33
permissions:
44
pull-requests: write
@@ -12,11 +12,9 @@ on:
1212
jobs:
1313

1414
live-merge:
15+
if: github.repository_owner == 'MicrosoftDocs'
1516
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
1617
with:
1718
PayloadJson: ${{ toJSON(github) }}
1819
secrets:
19-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
20-
21-
22-
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)