Unverified Commit ba6824db by Edward Thomson Committed by GitHub

Merge pull request #5771 from lhchavez/fix-ci

github-actions: Also rename the main branch here
parents c31032a3 1ddffb05
# Continuous integration and pull request validation builds for the # Continuous integration and pull request validation builds for the
# master and maintenance branches. # main and maintenance branches.
name: CI Build name: CI Build
on: on:
push: push:
branches: [ master, maint/* ] branches: [ main, maint/* ]
pull_request: pull_request:
branches: [ master, maint/* ] branches: [ main, maint/* ]
env: env:
docker-registry: docker.pkg.github.com docker-registry: docker.pkg.github.com
...@@ -254,7 +254,7 @@ jobs: ...@@ -254,7 +254,7 @@ jobs:
# Generate documentation using docurium. We'll upload the documentation # Generate documentation using docurium. We'll upload the documentation
# as a build artifact so that it can be reviewed as part of a pull # 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 # 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. # published to our documentation site.
documentation: documentation:
name: Generate documentation name: Generate documentation
......
# Nightly build for the master branch across multiple targets. # Nightly build for the main branch across multiple targets.
name: Nightly Build name: Nightly Build
on: on:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment