diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 723a0ad..dea9a8d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: Main on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: @@ -55,4 +55,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: make --environment-overrides release - if: github.event_name != 'pull_request' && (env.GIT_BRANCH == 'master' || startsWith(env.GIT_BRANCH, 'release/')) \ No newline at end of file + if: github.event_name != 'pull_request' && (env.GIT_BRANCH == 'main' || startsWith(env.GIT_BRANCH, 'release/')) \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e9062fa..5df11e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,7 @@ The **footer** should contain any information about **Breaking Changes** and is 1. Run test suite with the `$ make test test-integration` command and confirm that it passes :zap: 1. Ensure the doc is up to date with your changes with the `$ make docs`command :+1: 1. Commit your changes :memo: -1. Rebase your local changes against the `master` branch and squash your commits if necessary :bulb: +1. Rebase your local changes against the `main` branch and squash your commits if necessary :bulb: 1. Create new Pull Request :love_letter: Bugs, feature requests and comments are more than welcome in the [issues](https://github.com/arnaud-deprez/gsemver/issues). \ No newline at end of file diff --git a/README.md b/README.md index 4b92fe8..47103ac 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ gsemver is a command line tool developed in [Go (Golang)](https://golang.org/) t [![GoDoc](https://godoc.org/github.com/arnaud-deprez/gsemver?status.svg)](https://godoc.org/github.com/arnaud-deprez/gsemver) [![Downloads](https://img.shields.io/github/downloads/arnaud-deprez/gsemver/total.svg)](https://github.com/arnaud-deprez/gsemver/releases) [![Go Report Card](https://goreportcard.com/badge/github.com/arnaud-deprez/gsemver)](https://goreportcard.com/report/github.com/arnaud-deprez/gsemver) -[![MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/arnaud-deprez/gsemver/blob/master/LICENSE) -[![codecov](https://codecov.io/gh/arnaud-deprez/gsemver/branch/master/graph/badge.svg)](https://codecov.io/gh/arnaud-deprez/gsemver) +[![MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/arnaud-deprez/gsemver/blob/main/LICENSE) +[![codecov](https://codecov.io/gh/arnaud-deprez/gsemver/branch/main/graph/badge.svg)](https://codecov.io/gh/arnaud-deprez/gsemver) [![GitHub release](https://img.shields.io/github/release/arnaud-deprez/gsemver.svg)](https://github.com/arnaud-deprez/gsemver/releases) ## Table of Contents @@ -59,7 +59,7 @@ So for the second option, in order to provide human meaningful information by fo You can find some git convention such as: * [conventional commits](https://www.conventionalcommits.org): generalization of angular commit convention to other projects -* [angular commit convention](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines) +* [angular commit convention](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-guidelines) * [gitflow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) Then I looked for existing tools and here is a non exhaustive list of what I've found so far: @@ -161,7 +161,7 @@ The [conventional commits integration tests](test/integration/gsemver_bump_auto_ For a more comprehension view, here an example of the logs graph these tests generate: ```git -* 34385d9 (HEAD -> master, tag: v1.2.2) Merge from feature/merge2-release-1.1.x +* 34385d9 (HEAD -> main, tag: v1.2.2) Merge from feature/merge2-release-1.1.x |\ | * b884197 Merge from release/1.1.x | |\ @@ -188,7 +188,7 @@ For a more comprehension view, here an example of the logs graph these tests gen |/ * 145cbff (tag: v1.1.1) Merge from bug/fix-1 |\ -| * 681a11b fix: my bug fix on master +| * 681a11b fix: my bug fix on main |/ * e9e7644 (tag: v1.1.0) Merge from feature/awesome-2 |\ diff --git a/cmd/bump.go b/cmd/bump.go index 5abcb1c..5a07789 100644 --- a/cmd/bump.go +++ b/cmd/bump.go @@ -33,7 +33,7 @@ It can work in 2 fashions, the automatic or manual. Automatic way assumes: - your previous tags are semver compatible. - you follow some conventions in your commit and ideally https://www.conventionalcommits.org -- you follow some branch convention for your releases (eg. a release should be done on master or release/* branches) +- you follow some branch convention for your releases (eg. a release should be done on main, master or release/* branches) Base on this information, it is able to compute the next version. diff --git a/docs/cmd/gsemver_bump.md b/docs/cmd/gsemver_bump.md index 861c38a..150a98e 100644 --- a/docs/cmd/gsemver_bump.md +++ b/docs/cmd/gsemver_bump.md @@ -21,7 +21,7 @@ It can work in 2 fashions, the automatic or manual. Automatic way assumes: - your previous tags are semver compatible. - you follow some conventions in your commit and ideally https://www.conventionalcommits.org -- you follow some branch convention for your releases (eg. a release should be done on master or release/* branches) +- you follow some branch convention for your releases (eg. a release should be done on main, master or release/* branches) Base on this information, it is able to compute the next version.