Skip to content

Commit 66a7ce6

Browse files
committed
Merge branch 'main' into maccruz-aggregatedreporting
2 parents d18c4e8 + 79a9e60 commit 66a7ce6

File tree

1,449 files changed

+18467
-13436
lines changed

Some content is hidden

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

1,449 files changed

+18467
-13436
lines changed

.acrolinx-config.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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/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/help/platform/acrolinx-troubleshoot?branch)
5858
5959
"
6060
}

.github/workflows/AutoLabelAssign.yml

Lines changed: 3 additions & 1 deletion
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,6 +24,7 @@ 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:
@@ -32,4 +34,4 @@ jobs:
3234
ExcludedUserList: '["user1", "user2"]'
3335
ExcludedBranchList: '["branch1", "branch2"]'
3436
secrets:
35-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
37+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

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

.github/workflows/BackgroundTasks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
jobs:
1111
upload:
12+
if: github.repository_owner == 'MicrosoftDocs'
1213
runs-on: ubuntu-latest
1314

1415
steps:
@@ -23,4 +24,4 @@ jobs:
2324
- uses: actions/upload-artifact@v4
2425
with:
2526
name: PayloadJson
26-
path: pr/
27+
path: pr/

.github/workflows/BuildValidation.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ on:
1111
jobs:
1212

1313
build-status:
14+
if: github.repository_owner == 'MicrosoftDocs'
1415
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
1516
with:
1617
PayloadJson: ${{ toJSON(github) }}
1718
secrets:
1819
AccessToken: ${{ secrets.GITHUB_TOKEN }}
19-
20-
21-

.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 }}

.github/workflows/PrFileCount.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ on:
1212
jobs:
1313

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

.github/workflows/ProtectedFiles.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ on: [pull_request_target]
1010
jobs:
1111

1212
protected-files:
13+
if: github.repository_owner == 'MicrosoftDocs'
1314
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
1415
with:
1516
PayloadJson: ${{ toJSON(github) }}
1617
secrets:
17-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
18+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Stale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111

1212
jobs:
1313
stale:
14+
if: github.repository_owner == 'MicrosoftDocs'
1415
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-Stale.yml@workflows-prod
1516
with:
1617
RunDebug: false

0 commit comments

Comments
 (0)