Skip to content

Commit 1feeca8

Browse files
Merge branch 'public' into patch-2
2 parents 63df609 + 0f373dc commit 1feeca8

File tree

2,332 files changed

+196035
-44555
lines changed

Some content is hidden

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

2,332 files changed

+196035
-44555
lines changed

.acrolinx-config.edn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ If you need a scoring exception for content in this PR, add the *Sign off* and t
3535
- Escalate the exception request to the Acrolinx Review Team for review.
3636
- Approve the exception and work with the GitHub Admin Team to merge the PR to the default branch.
3737
38-
For more information about the exception criteria and exception process, see [Minimum Acrolinx topic scores for publishing](https://review.docs.microsoft.com/en-us/office-authoring-guide/acrolinx-min-score?branch=main).
38+
For more information about the exception criteria and exception process, see [Minimum Acrolinx topic scores for publishing](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-min-score?branch=main).
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

@@ -51,10 +51,10 @@ Select the total score link to review all feedback on clarity, consistency, tone
5151
"
5252
**More information about Acrolinx**
5353
54-
- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
54+
- [Install Acrolinx locally for VSCode for Magic](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-vscode?branch=main)
5555
- [False positives or issues](https://aka.ms/acrolinxbug)
5656
- [Request a new Acrolinx term](https://microsoft.sharepoint.com/teams/M365Dev2/SitePages/M365-terminology.aspx)
57-
- [Troubleshooting issues with Acrolinx](https://review.docs.microsoft.com/help/contribute/acrolinx-error-messages)
57+
- [Troubleshooting issues with Acrolinx](https://review.learn.microsoft.com/en-us/help/platform/acrolinx-troubleshoot?branch=main)
5858
5959
"
6060
}

.github/workflows/AutoLabelAssign.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
jobs:
1515
download-payload:
1616
name: Download and extract payload artifact
17+
if: github.repository_owner == 'MicrosoftDocs'
1718
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
1819
with:
1920
WorkflowId: ${{ github.event.workflow_run.id }}
@@ -23,13 +24,17 @@ jobs:
2324

2425
label-assign:
2526
name: Run assign and label
27+
if: github.repository_owner == 'MicrosoftDocs'
2628
needs: [download-payload]
2729
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
2830
with:
2931
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3032
AutoAssignUsers: 1
33+
AutoAssignReviewers: 1
3134
AutoLabel: 1
3235
ExcludedUserList: '["user1", "user2"]'
3336
ExcludedBranchList: '["branch1", "branch2"]'
3437
secrets:
3538
AccessToken: ${{ secrets.GITHUB_TOKEN }}
39+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
40+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/AutoLabelMsftContributor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
download-payload:
16-
if: github.repository_visibility == 'public'
16+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
1717
name: Download and extract payload artifact
1818
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
1919
with:
@@ -24,11 +24,12 @@ jobs:
2424

2525
label-msft:
2626
name: Label Microsoft contributors
27-
if: github.repository_visibility == 'public'
27+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
2828
needs: [download-payload]
2929
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
3030
with:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
secrets:
3333
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34-
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

.github/workflows/AutoPublish.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: (Scheduled) Publish to live
2+
3+
permissions:
4+
contents: write
5+
pull-requests: write
6+
checks: read
7+
8+
on:
9+
schedule:
10+
- cron: "25 2,5,8,11,14,17,20,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
11+
12+
workflow_dispatch:
13+
14+
jobs:
15+
16+
auto-publish:
17+
if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublishV2.yml@workflows-prod
19+
with:
20+
PayloadJson: ${{ toJSON(github) }}
21+
EnableAutoPublish: true
22+
EnableAutoMerge: true
23+
24+
secrets:
25+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
26+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
27+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/BackgroundTasks.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ permissions:
66

77
on:
88
pull_request_target:
9+
types: [opened, synchronize, reopened, ready_for_review]
910

1011
jobs:
1112
upload:
13+
if: github.repository_owner == 'MicrosoftDocs'
1214
runs-on: ubuntu-latest
1315

1416
steps:
@@ -23,4 +25,4 @@ jobs:
2325
- uses: actions/upload-artifact@v4
2426
with:
2527
name: PayloadJson
26-
path: pr/
28+
path: pr/
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +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+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)