Skip to content

Commit

Permalink
Update CI files to account for the master -> main rename (GH-25860)
Browse files Browse the repository at this point in the history
  • Loading branch information
pablogsal authored May 3, 2021
1 parent bb3e0c2 commit 2fc857a
Show file tree
Hide file tree
Showing 15 changed files with 1,881 additions and 2,040 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
coverage: false

trigger: ['master', '3.9', '3.8', '3.7']
trigger: ['main', '3.9', '3.8', '3.7']

jobs:
- job: Prebuild
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/pr.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
coverage: false

pr: ['master', '3.9', '3.8', '3.7']
pr: ['main', '3.9', '3.8', '3.7']

jobs:
- job: Prebuild
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributing to Python
Build Status
------------

- master
- main

+ `Stable buildbots <http://buildbot.python.org/3.x.stable/>`_

Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
```
Expand All @@ -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`.
-->
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_msi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: TestsMSI
on:
push:
branches:
- master
- main
- 3.9
- 3.8
- 3.7
paths:
- 'Tools/msi/**'
pull_request:
branches:
- master
- main
- 3.9
- 3.8
- 3.7
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Docs
on:
#push:
# branches:
# - master
# - main
# - 3.9
# - 3.8
# - 3.7
# paths:
# - 'Doc/**'
pull_request:
branches:
- master
- main
- 3.9
- 3.8
- 3.7
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:

branches:
only:
- master
- main
- /^\d\.\d+$/
- buildbot-custom

Expand Down
4 changes: 2 additions & 2 deletions PC/pyconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
file in their Makefile (other compilers are
generally taken care of by distutils.) */
# if defined(_DEBUG)
# pragma comment(lib,"python310_d.lib")
# pragma comment(lib,"python311_d.lib")
# elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib")
# else
# pragma comment(lib,"python310.lib")
# pragma comment(lib,"python311.lib")
# endif /* _DEBUG */
# endif /* _MSC_VER */
# endif /* Py_BUILD_CORE */
Expand Down
18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
This is Python version 3.11.0 alpha 1
=====================================

.. image:: https://travis-ci.com/python/cpython.svg?branch=master
.. image:: https://travis-ci.com/python/cpython.svg?branch=main
:alt: CPython build status on Travis CI
:target: https://travis-ci.com/python/cpython

.. image:: https://github.com/python/cpython/workflows/Tests/badge.svg
:alt: CPython build status on GitHub Actions
:target: https://github.com/python/cpython/actions

.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Azure%20Pipelines%20CI?branchName=master
.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Azure%20Pipelines%20CI?branchName=main
:alt: CPython build status on Azure DevOps
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=master
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=main

.. image:: https://img.shields.io/badge/discourse-join_chat-brightgreen.svg
:alt: Python Discourse chat
Expand Down Expand Up @@ -75,10 +75,10 @@ dependencies for various Linux distributions and macOS.

On macOS, there are additional configure and build options related
to macOS framework and universal builds. Refer to `Mac/README.rst
<https://github.com/python/cpython/blob/master/Mac/README.rst>`_.
<https://github.com/python/cpython/blob/main/Mac/README.rst>`_.

On Windows, see `PCbuild/readme.txt
<https://github.com/python/cpython/blob/master/PCbuild/readme.txt>`_.
<https://github.com/python/cpython/blob/main/PCbuild/readme.txt>`_.

If you wish, you can create a subdirectory and invoke configure from there.
For example::
Expand Down Expand Up @@ -139,9 +139,9 @@ What's New
We have a comprehensive overview of the changes in the `What's New in Python
3.10 <https://docs.python.org/3.10/whatsnew/3.10.html>`_ document. For a more
detailed change log, read `Misc/NEWS
<https://github.com/python/cpython/blob/master/Misc/NEWS.d>`_, but a full
<https://github.com/python/cpython/blob/main/Misc/NEWS.d>`_, but a full
accounting of changes can only be gleaned from the `commit history
<https://github.com/python/cpython/commits/master>`_.
<https://github.com/python/cpython/commits/main>`_.

If you want to install multiple versions of Python, see the section below
entitled "Installing multiple versions".
Expand All @@ -159,7 +159,7 @@ is primarily for documentation authors, translators, and people with special
formatting requirements.

For information about building Python's documentation, refer to `Doc/README.rst
<https://github.com/python/cpython/blob/master/Doc/README.rst>`_.
<https://github.com/python/cpython/blob/main/Doc/README.rst>`_.


Converting From Python 2.x to 3.x
Expand Down Expand Up @@ -255,7 +255,7 @@ rights reserved.

Copyright (c) 1991-1995 Stichting Mathematisch Centrum. All rights reserved.

See the `LICENSE <https://github.com/python/cpython/blob/master/LICENSE>`_ for
See the `LICENSE <https://github.com/python/cpython/blob/main/LICENSE>`_ for
information on the history of this software, terms & conditions for usage, and a
DISCLAIMER OF ALL WARRANTIES.

Expand Down
Loading

0 comments on commit 2fc857a

Please sign in to comment.