diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-01-07 14:28:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 14:28:10 +0000 |
| commit | ba6824db5b6fed0e241c6323451d9237a8466a68 (patch) | |
| tree | a6fedcea660e16995e1df44b2739fc05e364ec13 | |
| parent | c31032a3cf449b77c1ca2a966ec3ca31f2f1fb00 (diff) | |
| parent | 1ddffb0584231ffc3a36a009f96892ba083efccd (diff) | |
| download | libgit2-ba6824db5b6fed0e241c6323451d9237a8466a68.tar.gz | |
Merge pull request #5771 from lhchavez/fix-ci
github-actions: Also rename the main branch here
| -rw-r--r-- | .github/workflows/main.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 091f51844..f101eda65 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 fa83491ba..2f56fdb7f 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: |