Skip to content

Commit 0546a6d

Browse files
SHERMANOUKOSHERMANOUKO
committed
fix merge conflicts
2 parents 609512a + 7a5e886 commit 0546a6d

Some content is hidden

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

47 files changed

+2596
-1977
lines changed

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Any repo changes beyond docs require PM owner approval.
2+
* @localden @jmprieur
3+
4+
# Conceptual and API content needs the review of the engineering team.
5+
msal-python-conceptual/* @MicrosoftDocs/identity-sdk-cca-engineering-team
6+
7+
# API documentation does not have code owners, but that is OK.
8+
# Anyone can create a PR to the `main` branch and we will review
9+
# the changes on the one-off basis.
10+
python/

‎.github/policies/auto-merge.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Approve and auto-squash-merge bot PRs to main labeled 'auto-merge'
12+
triggerOnOwnActions: true
13+
if:
14+
- payloadType: Pull_Request
15+
- labelAdded:
16+
label: ':octocat: auto-merge'
17+
- targetsBranch:
18+
branch: main
19+
- isActivitySender:
20+
user: microsoft-github-policy-service[bot]
21+
then:
22+
- enableAutoMerge:
23+
mergeMethod: Squash
24+
- approvePullRequest:
25+
comment: "Approved; this PR will merge when all status checks pass."
26+
27+
- description: Auto-merge policy service bot PRs to live labeled 'auto-merge'
28+
triggerOnOwnActions: true
29+
if:
30+
- payloadType: Pull_Request
31+
- labelAdded:
32+
label: ':octocat: auto-merge'
33+
- targetsBranch:
34+
branch: live
35+
- isActivitySender:
36+
user: microsoft-github-policy-service[bot]
37+
then:
38+
- enableAutoMerge:
39+
mergeMethod: Merge
40+
41+
- description: Don't auto-merge PRs with 'auto-merge' label removed
42+
if:
43+
- payloadType: Pull_Request
44+
- labelRemoved:
45+
label: ':octocat: auto-merge'
46+
then:
47+
- disableAutoMerge

‎.github/policies/label-new-issues.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Add untriaged label to new issues
12+
if:
13+
- payloadType: Issues
14+
- isAction:
15+
action: Opened
16+
then:
17+
- addLabel:
18+
label: untriaged

‎.github/policies/scheduled-prod-sync.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: GitOps.PullRequestIssueManagement - Scheduled PRs
2+
description: Creates pull requests on a schedule
3+
resource: repository
4+
5+
where:
6+
configuration:
7+
resourceManagementConfiguration:
8+
scheduledSearches:
9+
- description: Push to live branch (scheduled 11AM PT publish)
10+
frequencies:
11+
- daily:
12+
time: 18:00
13+
filters: []
14+
actions:
15+
- createPullRequest:
16+
head: main
17+
base: live
18+
title: Merge main into live
19+
body: Automated merge of the main branch into live.
20+
21+
- description: Push to live branch (scheduled 7PM PT publish)
22+
frequencies:
23+
- daily:
24+
time: 2:00
25+
filters: []
26+
actions:
27+
- createPullRequest:
28+
head: main
29+
base: live
30+
title: Merge main into live
31+
body: Automated merge of the main branch into live.
32+
33+
- description: Push to live branch (scheduled 3AM PT publish)
34+
frequencies:
35+
- daily:
36+
time: 10:00
37+
filters: []
38+
actions:
39+
- createPullRequest:
40+
head: main
41+
base: live
42+
title: Merge main into live
43+
body: Automated merge of the main branch into live.

‎.github/policies/scheduled-stage-sync.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: GitOps.PullRequestIssueManagement - Scheduled PRs
2+
description: Creates pull requests on a schedule
3+
resource: repository
4+
5+
where:
6+
configuration:
7+
resourceManagementConfiguration:
8+
scheduledSearches:
9+
- description: Push to main branch (scheduled 10AM PT publish)
10+
frequencies:
11+
- daily:
12+
time: 17:00
13+
filters: []
14+
actions:
15+
- createPullRequest:
16+
head: smoke-test
17+
base: main
18+
title: Merge smoke-test into main
19+
body: Automated merge of the smoke-test branch into main.
20+
21+
- description: Push to main branch (scheduled 6PM PT publish)
22+
frequencies:
23+
- daily:
24+
time: 1:00
25+
filters: []
26+
actions:
27+
- createPullRequest:
28+
head: smoke-test
29+
base: main
30+
title: Merge smoke-test into main
31+
body: Automated merge of the smoke-test branch into main.
32+
33+
- description: Push to main branch (scheduled 2AM PT publish)
34+
frequencies:
35+
- daily:
36+
time: 9:00
37+
filters: []
38+
actions:
39+
- createPullRequest:
40+
head: smoke-test
41+
base: main
42+
title: Merge smoke-test into main
43+
body: Automated merge of the smoke-test branch into main.

‎.github/policies/stale-issues.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Stale issues
2+
description: Close needs-more-info issues that haven't had a response in 14 days
3+
resource: repository
4+
where:
5+
configuration:
6+
resourceManagementConfiguration:
7+
scheduledSearches:
8+
- frequencies:
9+
- daily:
10+
time: 12:00
11+
filters:
12+
- isIssue
13+
- isOpen
14+
- hasLabel:
15+
label: needs-more-info
16+
- noActivitySince:
17+
days: 14
18+
actions:
19+
- addReply:
20+
reply: This issue has been automatically closed due to no response from the original author. Feel free to reopen it if you have more information that can help us investigate the issue further.
21+
- closeIssue

‎.github/policies/tag-automatic-pr.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Sync API docs to staging
12+
triggerOnOwnActions: true
13+
if:
14+
- payloadType: Pull_Request
15+
- isAction:
16+
action: Opened
17+
- isActivitySender:
18+
user: microsoft-github-policy-service[bot]
19+
- titleContains:
20+
pattern: Merge smoke-test into main
21+
isRegex: False
22+
then:
23+
- addLabel:
24+
label: ':octocat: auto-merge'
25+
26+
- description: Sync staging to production
27+
triggerOnOwnActions: true
28+
if:
29+
- payloadType: Pull_Request
30+
- isAction:
31+
action: Opened
32+
- isActivitySender:
33+
user: microsoft-github-policy-service[bot]
34+
- titleContains:
35+
pattern: Merge main into live
36+
isRegex: False
37+
then:
38+
- addLabel:
39+
label: ':octocat: auto-merge'

‎.github/workflows/linkvalidator.yml‎

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

1010
jobs:
1111
linkChecker:
12+
permissions:
13+
contents: write
14+
issues: write
1215
runs-on: ubuntu-latest
1316
steps:
1417
- uses: actions/checkout@v3
@@ -19,7 +22,7 @@ jobs:
1922
env:
2023
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2124
with:
22-
args: --verbose --exclude-file .lycheeignore --no-progress './**/*.md' --exclude-mail
25+
args: --accept=200,429,403,502,503 --verbose --no-progress './**/*.md'
2326
fail: true
2427

2528
- name: Create Issue From File

‎.lycheeignore‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
https://aka.ms/msal/estsr/guidance
2-
xref:.+
2+
xref:.*
33
https://go.microsoft.com/fwlink/\?linkid=2083908
4-
https://endpoint.microsoft.com.+
5-
https://portal.azure.com.+
6-
https://account.microsoft.com.+
4+
https://endpoint.microsoft.com.*
5+
https://portal.azure.com.*
6+
https://account.microsoft.com.*
7+
https://azure.microsoft.com/overview/azure-stack.*
8+
https://azure.microsoft.com/products/kubernetes-service.*

‎.openpublishing.build.ps1‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)