Skip to content

Commit c328550

Browse files
Merge pull request #111 from MicrosoftDocs/main
Merge main into live
2 parents d577f5e + bf16c5c commit c328550

File tree

10 files changed

+144
-133
lines changed

10 files changed

+144
-133
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-label-pr.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ configuration:
1616
label: ':octocat: auto-merge'
1717
- targetsBranch:
1818
branch: main
19-
- or:
20-
- isActivitySender:
21-
user: microsoft-github-policy-service[bot]
19+
- isActivitySender:
20+
user: microsoft-github-policy-service[bot]
2221
then:
2322
- enableAutoMerge:
2423
mergeMethod: Squash
@@ -33,14 +32,11 @@ configuration:
3332
label: ':octocat: auto-merge'
3433
- targetsBranch:
3534
branch: live
36-
- or:
37-
- isActivitySender:
38-
user: microsoft-github-policy-service[bot]
35+
- isActivitySender:
36+
user: microsoft-github-policy-service[bot]
3937
then:
4038
- enableAutoMerge:
4139
mergeMethod: Merge
42-
- approvePullRequest:
43-
comment: "Approved; this PR will merge when all status checks pass."
4440

4541
- description: Don't auto-merge PRs with 'auto-merge' label removed
4642
if:

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,38 @@ where:
66
configuration:
77
resourceManagementConfiguration:
88
scheduledSearches:
9-
- description: Push to main (scheduled sync)
9+
- description: Push to live branch (scheduled 11AM PT publish)
1010
frequencies:
1111
- daily:
12-
time: 1:00
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:
1323
- daily:
14-
time: 9:00
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:
1535
- daily:
16-
time: 17:00
36+
time: 10:00
1737
filters: []
1838
actions:
1939
- createPullRequest:
2040
head: main
2141
base: live
2242
title: Merge main into live
23-
body: Please don't squash-merge this PR.
43+
body: Automated merge of the main branch into live.
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/scheduled-sync.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.
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.*

README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
# Microsoft Authentication Library (MSAL) for Python Documentation
1+
# Microsoft Authentication Library (MSAL) for Python
22

33
[![Validate existing links](https://github.com/MicrosoftDocs/microsoft-authentication-library-for-python/actions/workflows/linkvalidator.yml/badge.svg)](https://github.com/MicrosoftDocs/microsoft-authentication-library-for-python/actions/workflows/linkvalidator.yml)
44

5-
This is the documentation repository for Microsoft Authentication Library (MSAL) for Python. If you are looking for the library, refer to [AzureAD/microsoft-authentication-library-for-python](https://github.com/AzureAD/microsoft-authentication-library-for-python).
5+
This is the **documentation repository** for Microsoft Authentication Library (MSAL) for Python.
6+
7+
| Resource | Location |
8+
|:-----------------------------|:-----------|
9+
|**SDK Repository** | [`AzureAD/microsoft-authentication-library-for-python`](https://github.com/AzureAD/microsoft-authentication-library-for-python) |
10+
|**SDK Package** | [`msal`](https://pypi.org/project/msal/) |
11+
|**SDK Documentation** | [MSAL for Python on Microsoft Learn](https://learn.microsoft.com/entra/msal/python/) |
12+
| 🔒 **SDK Documentation CI Job** | [Azure Pipelines](https://apidrop.visualstudio.com/Content%20CI/_build?definitionId=6169) |
613

714
## Contributions
815

916
Contributions to our documentation are welcome. Make sure to familiarize yourself with the [Microsoft Writing Style Guide](https://learn.microsoft.com/style-guide/welcome/) and the [Contributor Guide](https://learn.microsoft.com/contribute/) before making any changes.
1017

11-
> **Warning**
12-
> **Do not** modify any YML files in the `python/docs-ref-autogen` folder - those are generated automatically from the library source code and any changes will be automatically overwritten the next time the documentation Continuous Integration (CI) job runs. To make changes to any API docs you will need to open a pull request in the [AzureAD/microsoft-authentication-library-for-python](https://github.com/AzureAD/microsoft-authentication-library-for-python) repository.
13-
14-
If you would like to author an entirely new document (e.g., for a new scenario), make sure to [open an issue](https://github.com/MicrosoftDocs/microsoft-authentication-library-for-python/issues) first. This will allow the engineering team to discuss the proposed changes and ensure that it won't be overwritten by future changes.
18+
If you would like to author an entirely new document (e.g., for a new scenario), make sure to [open an issue](https://github.com/AzureAD/microsoft-authentication-library-for-python/issues) first. This will allow the engineering team to discuss the proposed changes and ensure that it won't be overwritten by future changes.
1519

16-
## API reference documentation automation
20+
## API Documentation
1721

18-
Continuous Integration (CI) jobs for this repository are available in the [automation Azure DevOps instance](https://apidrop.visualstudio.com/Content%20CI/_build?definitionId=6169).
22+
**Do not** modify any XML files in the `python/docs-ref-autogen` folder - those are generated automatically from the library source code and any changes will be automatically overwritten the next time the documentation runs.
1923

20-
>**Note**
21-
>The changes from the CI job will always be pushed to the `smoke-test` branch first. To propagate them to production, merge the changes into `main`, and then merge `main` to `live`. Ensure that all checks pass before merging changes.
24+
To make changes to any API docs you will need to open a pull request in the [`AzureAD/microsoft-authentication-library-for-python`](https://github.com/AzureAD/microsoft-authentication-library-for-python) repository and amend code comments.
2225

2326
## Microsoft Open Source Code of Conduct
2427

0 commit comments

Comments
 (0)