The default branch is now named 'main'

This commit is contained in:
Ray Speth
2020-07-01 10:29:28 -04:00
parent f1646a6456
commit cb1230b076
5 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
<!-- Thanks for contributing code! Please include a description of your change and check your PR against the list below. For further questions, refer to the contributing guide (https://github.com/Cantera/cantera/blob/master/CONTRIBUTING.md). -->
<!-- Thanks for contributing code! Please include a description of your change and check your PR against the list below. For further questions, refer to the contributing guide (https://github.com/Cantera/cantera/blob/main/CONTRIBUTING.md). -->
**Checklist**
+2 -2
View File
@@ -1,6 +1,6 @@
# How to get support
> This project has a [Code of Conduct](https://github.com/Cantera/cantera/blob/master/CODE_OF_CONDUCT.md).
> This project has a [Code of Conduct](https://github.com/Cantera/cantera/blob/main/CODE_OF_CONDUCT.md).
> By interacting with this repository, organisation, or community you agree to
> abide by its terms.
@@ -35,4 +35,4 @@ Cantera](https://cantera.org/documentation/dev-docs.html) is also available.
## Contributions
See [`CONTRIBUTING.md`](https://github.com/Cantera/cantera/blob/master/CONTRIBUTING.md) on how to contribute.
See [`CONTRIBUTING.md`](https://github.com/Cantera/cantera/blob/main/CONTRIBUTING.md) on how to contribute.
+6 -6
View File
@@ -5,14 +5,14 @@ on:
# Build on tags that look like releases
tags:
- v*
# Build when master or testing is pushed to
# Build when main or testing is pushed to
branches:
- master
- main
- testing
pull_request:
# Build when a pull request targets master
# Build when a pull request targets main
branches:
- master
- main
jobs:
ubuntu-multiple-pythons:
@@ -138,13 +138,13 @@ jobs:
# machine that has previously logged in to cantera.org and trusts
# that it logged in to the right machine
- name: Set up SSH key and host for deploy
if: github.event_name == 'push' && github.repository_owner == 'Cantera' && github.ref == 'master'
if: github.event_name == 'push' && github.repository_owner == 'Cantera' && github.ref == 'main'
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.CTDEPLOY_KEY }}
known_hosts: ${{ secrets.CTDEPLOY_HOST }}
- name: Upload the docs
if: github.event_name == 'push' && github.repository_owner == 'Cantera' && github.ref == 'master'
if: github.event_name == 'push' && github.repository_owner == 'Cantera' && github.ref == 'main'
env:
RSYNC_USER: "ctdeploy"
RSYNC_SERVER: "cantera.org"