diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-10-11 17:26:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-10-11 17:26:07 +0000 |
| commit | 87aaa0207e098727f9bdc217985e02e1ea9b1c1f (patch) | |
| tree | 71b59ee43bb86031483d551e64a109b8997e72a5 /.github | |
| parent | c94a4b2cea888903fdc9595917b10c4fa8b36afc (diff) | |
| parent | b91e76a4f7b9827d0d15c3c562af77f900a92091 (diff) | |
| download | sqlalchemy-87aaa0207e098727f9bdc217985e02e1ea9b1c1f.tar.gz | |
Merge "rename elements to main" into main
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/run-on-pr.yaml | 6 | ||||
| -rw-r--r-- | .github/workflows/run-test.yaml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml index afa206666..ca1864899 100644 --- a/.github/workflows/run-on-pr.yaml +++ b/.github/workflows/run-on-pr.yaml @@ -1,10 +1,10 @@ name: Run tests on a pr on: - # run on pull request to master excluding changes that are only on doc or example folders + # run on pull request to main excluding changes that are only on doc or example folders pull_request: branches: - - master + - main paths-ignore: - "examples/**" @@ -118,7 +118,7 @@ jobs: - name: Run tests run: tox -e pep8 - # Arm emulation is quite slow (~20min) so for now just run it when merging to master + # Arm emulation is quite slow (~20min) so for now just run it when merging to main # run-test-arm64: # name: ${{ matrix.python-version }}-${{ matrix.build-type }}-arm64-ubuntu-latest # runs-on: ubuntu-latest diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml index eae148d5f..cd71555bd 100644 --- a/.github/workflows/run-test.yaml +++ b/.github/workflows/run-test.yaml @@ -1,10 +1,10 @@ name: Run tests on: - # run on push in master or rel_* branches excluding changes are only on doc or example folders + # run on push in main or rel_* branches excluding changes are only on doc or example folders push: branches: - - master + - main - "rel_*" # branches used to test the workflow - "workflow_test_*" |