Skip to content

Commit 666e297

Browse files
authored
Merge branch 'main' into patch-4
2 parents 0b54c85 + 83b11af commit 666e297

File tree

619 files changed

+13888
-4749
lines changed

Some content is hidden

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

619 files changed

+13888
-4749
lines changed

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

.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: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: (Scheduled) Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
workflow_dispatch:
11+
12+
jobs:
13+
stale:
14+
if: github.repository_owner == 'MicrosoftDocs'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-Stale.yml@workflows-prod
16+
with:
17+
RunDebug: false
18+
RepoVisibility: ${{ github.repository_visibility }}
19+
secrets:
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/StaleBranch.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: (Scheduled) Stale branch removal
2+
3+
permissions:
4+
contents: write
5+
pull-requests: read
6+
7+
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
8+
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.
9+
# The workflow should not be configured to run after "deletion day" so that users can review the branches were deleted.
10+
# Recommendation: configure cron to run on days 1,15-31 where 1 is what's configured in 'DeleteOnDayOfMonth'. If 'DeleteOnDayOfMonth' is set to something else, update cron to run the two weeks leading up to it.
11+
12+
on:
13+
schedule:
14+
- cron: "0 9 1,15-31 * *"
15+
16+
workflow_dispatch:
17+
18+
19+
jobs:
20+
21+
stale-branch:
22+
if: github.repository_owner == 'MicrosoftDocs'
23+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
24+
with:
25+
PayloadJson: ${{ toJSON(github) }}
26+
RepoBranchSkipList: '[
27+
"ExampleBranch1",
28+
"ExampleBranch2"
29+
]'
30+
ReportOnly: false
31+
secrets:
32+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)