diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index a151f5e..df6ea79 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -6,7 +6,7 @@ on: # Run this workflow every time a PR is merged to main or a release tag is added push: branches: - - master + - main tags: - '*' @@ -95,7 +95,7 @@ jobs: dev_deploy: runs-on: ubuntu-latest needs: test_pyver - if: (github.ref == 'refs/heads/master') || contains(github.ref, 'refs/tags/') + if: (github.ref == 'refs/heads/main') || contains(github.ref, 'refs/tags/') env: AC_LABEL: dev steps: diff --git a/docs/source/developer/contributing.rst b/docs/source/developer/contributing.rst index ec378ac..ee22dcf 100644 --- a/docs/source/developer/contributing.rst +++ b/docs/source/developer/contributing.rst @@ -145,7 +145,7 @@ code review UIs). Stability ''''''''' -The repository's ``master`` branch is expected to be stable at all times. +The repository's ``main`` branch is expected to be stable at all times. This translates into the fact that the test suite passes without errors on all supported platforms (see below). This also means that a pull request also needs to pass the test suite before it is merged in. @@ -155,7 +155,7 @@ also needs to pass the test suite before it is merged in. Platform support '''''''''''''''' -Every commit to the master branch is automatically tested on a selection of +Every commit to the ``main`` branch is automatically tested on a selection of platforms. `Azure `_ is used to to provide public continuous integration information for as many combinations as can be supported by the service. If you see problems on platforms with which you