diff options
| author | Pablo Galindo <Pablogsal@gmail.com> | 2021-05-03 22:36:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 22:36:55 (GMT) |
| commit | 2fc857a5721a5b42bcb696c9cae1bbcc82a91b17 (patch) | |
| tree | e2f3215539a6c70bd583648a75f4686b5c16cb26 /.github | |
| parent | bb3e0c240bc60fe08d332ff5955d54197f79751c (diff) | |
| download | cpython-2fc857a5721a5b42bcb696c9cae1bbcc82a91b17.zip cpython-2fc857a5721a5b42bcb696c9cae1bbcc82a91b17.tar.gz cpython-2fc857a5721a5b42bcb696c9cae1bbcc82a91b17.tar.bz2 | |
Update CI files to account for the master -> main rename (GH-25860)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/CONTRIBUTING.rst | 2 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 4 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/build_msi.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/doc.yml | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst index a81935d..2ac148e 100644 --- a/.github/CONTRIBUTING.rst +++ b/.github/CONTRIBUTING.rst @@ -4,7 +4,7 @@ Contributing to Python Build Status ------------ -- master +- main + `Stable buildbots <http://buildbot.python.org/3.x.stable/>`_ diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2731c0e..79ceb17 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,7 +16,7 @@ Most PRs will require an issue number. Trivial changes, like fixing a typo, do n # Backport Pull Request title -If this is a backport PR (PR made against branches other than `master`), +If this is a backport PR (PR made against branches other than `main`), please ensure that the PR title is in the following format: ``` @@ -25,6 +25,6 @@ please ensure that the PR title is in the following format: Where: [X.Y] is the branch name, e.g. [3.6]. -GH-NNNN refers to the PR number from `master`. +GH-NNNN refers to the PR number from `main`. --> diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41200bb..baa15f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,13 +6,13 @@ name: Tests on: push: branches: - - master + - main - 3.9 - 3.8 - 3.7 pull_request: branches: - - master + - main - 3.9 - 3.8 - 3.7 diff --git a/.github/workflows/build_msi.yml b/.github/workflows/build_msi.yml index 182eb7c..074f70d 100644 --- a/.github/workflows/build_msi.yml +++ b/.github/workflows/build_msi.yml @@ -3,7 +3,7 @@ name: TestsMSI on: push: branches: - - master + - main - 3.9 - 3.8 - 3.7 @@ -11,7 +11,7 @@ on: - 'Tools/msi/**' pull_request: branches: - - master + - main - 3.9 - 3.8 - 3.7 diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 8924fc9..2f2aea5 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -3,7 +3,7 @@ name: Docs on: #push: # branches: - # - master + # - main # - 3.9 # - 3.8 # - 3.7 @@ -11,7 +11,7 @@ on: # - 'Doc/**' pull_request: branches: - - master + - main - 3.9 - 3.8 - 3.7 |