Skip to content

Commit

Permalink
rename master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
joemiller committed Mar 1, 2022
1 parent ddeeea3 commit d75aa87
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: install goreleaser
# only need to lint goreleaser on one platform:
if: startsWith(runner.os, 'Linux')
run : |
run: |
#curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sudo sh -s -- -b /usr/local/bin
curl -sfL https://github.com/goreleaser/goreleaser/releases/download/v0.183.0/goreleaser_Linux_x86_64.tar.gz | tar -xvzf - goreleaser
sudo mv goreleaser /usr/local/bin
Expand Down Expand Up @@ -74,8 +74,8 @@ jobs:

release-test:
needs: [lint, test]
# don't waste time running a goreleaser test build on master since we will run a full release:
if: github.ref != 'refs/heads/master'
# don't waste time running a goreleaser test build on main since we will run a full release:
if: github.ref != 'refs/heads/main'
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -126,8 +126,8 @@ jobs:

release:
needs: [lint, test]
# only create a release on master builds:
if: github.ref == 'refs/heads/master'
# only create a release on main builds:
if: github.ref == 'refs/heads/main'
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -170,9 +170,9 @@ jobs:
# and autotag can calculate the next version tag:
git fetch --tags --unshallow --prune
if [ $(git rev-parse --abbrev-ref HEAD) != "master" ]; then
# ensure a local 'master' branch exists for autotag to work correctly:
git branch --track master origin/master
if [ $(git rev-parse --abbrev-ref HEAD) != "main" ]; then
# ensure a local 'main' branch exists for autotag to work correctly:
git branch --track main origin/main
fi
- name: install release deps
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,20 +218,20 @@ The most complete way to run all tests would be to run `make test` under each pl

[Github Actions](https://github.com/joemiller/vault-token-helper/actions) is used for CI/CD.

Tests are run on pull requests and versioned releases are generated on all successful master branch
Tests are run on pull requests and versioned releases are generated on all successful main branch
builds.

Some tests are not run in CI/CD due to requiring an interactive desktop such as the Linux
DBus Secret Service backend.

### Release Management

Releases are cut automatically on all successful master branch builds. This project uses
Releases are cut automatically on all successful main branch builds. This project uses
[autotag](https://github.com/pantheon-systems/autotag) and [goreleaser](https://goreleaser.com/) to
automate this process.

Semver (`vMajor.Minor.Patch`) is used for versioning and releases. By default, autotag will bump the
patch version on a successful master build, eg: `v1.0.0` -> `v1.0.1`.
patch version on a successful main build, eg: `v1.0.0` -> `v1.0.1`.

To bump the major or minor release instead, include `[major]` or `[minor]` in the commit message.
Refer to the autotag [docs](https://github.com/pantheon-systems/autotag#incrementing-major-and-minor-versions)
Expand Down

0 comments on commit d75aa87

Please sign in to comment.