Commit ba6824db5b6fed0e241c6323451d9237a8466a68
2021-01-07T14:28:10
Merge pull request #5771 from lhchavez/fix-ci github-actions: Also rename the main branch here
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 091f518..f101eda 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,12 +1,12 @@
# Continuous integration and pull request validation builds for the
-# master and maintenance branches.
+# main and maintenance branches.
name: CI Build
on:
push:
- branches: [ master, maint/* ]
+ branches: [ main, maint/* ]
pull_request:
- branches: [ master, maint/* ]
+ branches: [ main, maint/* ]
env:
docker-registry: docker.pkg.github.com
@@ -254,7 +254,7 @@ jobs:
# Generate documentation using docurium. We'll upload the documentation
# as a build artifact so that it can be reviewed as part of a pull
# request or in a forked build. For CI builds in the main repository's
- # master branch, we'll push the gh-pages branch back up so that it is
+ # main branch, we'll push the gh-pages branch back up so that it is
# published to our documentation site.
documentation:
name: Generate documentation
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index fa83491..2f56fdb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,4 +1,4 @@
-# Nightly build for the master branch across multiple targets.
+# Nightly build for the main branch across multiple targets.
name: Nightly Build
on: