Skip to content

Commit d75aa87

Browse files
committed
rename master to main
1 parent ddeeea3 commit d75aa87

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/main.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: install goreleaser
2828
# only need to lint goreleaser on one platform:
2929
if: startsWith(runner.os, 'Linux')
30-
run : |
30+
run: |
3131
#curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sudo sh -s -- -b /usr/local/bin
3232
curl -sfL https://github.com/goreleaser/goreleaser/releases/download/v0.183.0/goreleaser_Linux_x86_64.tar.gz | tar -xvzf - goreleaser
3333
sudo mv goreleaser /usr/local/bin
@@ -74,8 +74,8 @@ jobs:
7474

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

127127
release:
128128
needs: [lint, test]
129-
# only create a release on master builds:
130-
if: github.ref == 'refs/heads/master'
129+
# only create a release on main builds:
130+
if: github.ref == 'refs/heads/main'
131131
runs-on: macos-latest
132132
steps:
133133
- uses: actions/checkout@v2
@@ -170,9 +170,9 @@ jobs:
170170
# and autotag can calculate the next version tag:
171171
git fetch --tags --unshallow --prune
172172
173-
if [ $(git rev-parse --abbrev-ref HEAD) != "master" ]; then
174-
# ensure a local 'master' branch exists for autotag to work correctly:
175-
git branch --track master origin/master
173+
if [ $(git rev-parse --abbrev-ref HEAD) != "main" ]; then
174+
# ensure a local 'main' branch exists for autotag to work correctly:
175+
git branch --track main origin/main
176176
fi
177177
178178
- name: install release deps

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,20 +218,20 @@ The most complete way to run all tests would be to run `make test` under each pl
218218

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

221-
Tests are run on pull requests and versioned releases are generated on all successful master branch
221+
Tests are run on pull requests and versioned releases are generated on all successful main branch
222222
builds.
223223

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

227227
### Release Management
228228

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

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

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

0 commit comments

Comments
 (0)