Skip to content

Commit

Permalink
Merge pull request #87 from esc/master_to_main
Browse files Browse the repository at this point in the history
documentation and CI changes for moving from master to main
  • Loading branch information
sklam authored Aug 4, 2022
2 parents 39ae0b9 + 1e8a58a commit cdef9cc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- '*'

Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/developer/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 <https://dev.azure.com/numba/numba/_build>`_ 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
Expand Down

0 comments on commit cdef9cc

Please sign in to comment.