Skip to content

Commit 5dff008

Browse files
chrisdachrisda
authored
Merge branch 'main' into patch-1
2 parents f6aeead + 28bbd32 commit 5dff008

File tree

904 files changed

+70049
-23396
lines changed

Some content is hidden

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

904 files changed

+70049
-23396
lines changed

Diff for: ‎.github/workflows/AutoLabelAssign.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Assign and label PR
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+
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 }}
24+
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 }}

Diff for: ‎.github/workflows/AutoLabelMsftContributor.yml

+35
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 }}

Diff for: ‎.github/workflows/AutoPublish.yml

+25
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 }}

Diff for: ‎.github/workflows/BackgroundTasks.yml

+27
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/

Diff for: ‎.github/workflows/BuildValidation.yml

+19
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 }}

Diff for: ‎.github/workflows/LiveMergeCheck.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: PR can merge into branch
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, edited]
11+
12+
jobs:
13+
14+
live-merge:
15+
if: github.repository_owner == 'MicrosoftDocs'
16+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
17+
with:
18+
PayloadJson: ${{ toJSON(github) }}
19+
secrets:
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/PrFileCount.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: PR file count less than limit
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, labeled, unlabeled, edited]
11+
12+
jobs:
13+
14+
file-count:
15+
if: github.repository_owner == 'MicrosoftDocs'
16+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
17+
with:
18+
PayloadJson: ${{ toJSON(github) }}
19+
secrets:
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/ProtectedFiles.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: PR has no protected files
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on: [pull_request_target]
9+
10+
jobs:
11+
12+
protected-files:
13+
if: github.repository_owner == 'MicrosoftDocs'
14+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
15+
with:
16+
PayloadJson: ${{ toJSON(github) }}
17+
secrets:
18+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/Stale.yml

+20
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 }}

Diff for: ‎.github/workflows/StaleBranch.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: (Scheduled) Stale branch removal
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
schedule:
8+
- cron: "0 9 1 * *"
9+
10+
# workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
if: github.repository_owner == 'MicrosoftDocs'
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
18+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
RepoBranchSkipList: '[
21+
"ExampleBranch1",
22+
"ExampleBranch2"
23+
]'
24+
ReportOnly: false
25+
secrets:
26+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/TierManagement.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Tier management
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
issue_comment:
9+
types: [created, edited]
10+
11+
jobs:
12+
13+
tier-mgmt:
14+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'private'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-TierManagement.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
EnableWriteSignOff: 1
19+
EnableReadOnlySignoff: 1
20+
secrets:
21+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.openpublishing.build.ps1

-17
This file was deleted.

Diff for: ‎ContentOwners.txt

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# Order is important! The last matching pattern has the most precedence.
5+
# So if a pull request only touches javascript files, only these owners
6+
# will be requested to review.
7+
8+
/docset/ @roharwoo
9+

Diff for: ‎TeamsAdmin.png

-6.97 KB
Binary file not shown.

Diff for: ‎cabgen-bootstrap.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ pr: none # Disable pull request triggers.
55

66
resources:
77
repositories:
8-
- repository: templates
8+
- repository: ReferenceAutomation
99
type: git
1010
name: Content CI/ReferenceAutomation
1111
ref: refs/heads/master
1212

1313
extends:
14-
template: PowerShell/cabgen.yml@templates
14+
template: PowerShell/cabgen.yml@ReferenceAutomation

0 commit comments

Comments
 (0)