From 416d76eec4f3ae752e981c3842bcb9f44397b1e8 Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Fri, 12 Nov 2021 17:23:32 -0300 Subject: [PATCH] feat: rename main branch refs #2645 --- .github/ISSUE_TEMPLATE/bug.yaml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/generate.yml | 4 ++-- .github/workflows/lint.yml | 1 - .github/workflows/misspell.yml | 1 - CONTRIBUTING.md | 5 ++--- README.md | 2 +- www/docs/contributing.md | 5 ++--- www/docs/customization/includes.md | 2 +- www/docs/install.md | 2 +- www/docs/links.md | 4 ++-- www/mkdocs.yml | 2 +- 13 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index f0dd1038b..9a7daa3ae 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -50,7 +50,7 @@ body: id: terms attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/goreleaser/goreleaser/blob/master/CODE_OF_CONDUCT.md) + description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/goreleaser/goreleaser/blob/main/CODE_OF_CONDUCT.md) options: - label: I agree to follow this project's Code of Conduct required: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c80bf13d5..3fbab60a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: push: branches: - - 'master' + - 'main' tags: - 'v*' pull_request: @@ -100,7 +100,7 @@ jobs: run: snapcraft login --with <(echo "${{ secrets.SNAPCRAFT_LOGIN }}") - name: GoReleaser - if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c05826b80..30742a81e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: docs on: push: branches: - - 'master' + - 'main' paths: - '.github/workflows/htmltest.yml' - 'www/*' diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 6dbd1682b..efec96daf 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -3,7 +3,7 @@ name: generate on: push: branches: - - 'master' + - 'main' paths: - '.github/workflows/generate.yml' - CONTRIBUTING.md @@ -24,4 +24,4 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: "docs: update" - branch: master + branch: main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 38ab08472..6bad29b00 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,6 @@ on: tags: - v* branches: - - master - main pull_request: jobs: diff --git a/.github/workflows/misspell.yml b/.github/workflows/misspell.yml index e2aac2faa..b69525c76 100644 --- a/.github/workflows/misspell.yml +++ b/.github/workflows/misspell.yml @@ -4,7 +4,6 @@ on: tags: - v* branches: - - master - main pull_request: jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 599a8c3fe..2124e5598 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -By participating to this project, you agree to abide our [code of conduct](https://github.com/goreleaser/goreleaser/blob/master/CODE_OF_CONDUCT.md). +By participating to this project, you agree to abide our [code of conduct](https://github.com/goreleaser/goreleaser/blob/main/CODE_OF_CONDUCT.md). ## Setup your machine @@ -62,8 +62,7 @@ You can follow the documentation on ## Submit a pull request -Push your branch to your `goreleaser` fork and open a pull request against the -master branch. +Push your branch to your `goreleaser` fork and open a pull request against the main branch. ## Financial contributions diff --git a/README.md b/README.md index 490c26853..103e8dd0a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Documentation is hosted live at https://goreleaser.com [![Release](https://img.shields.io/github/release/goreleaser/goreleaser.svg?style=for-the-badge)](https://github.com/goreleaser/goreleaser/releases/latest) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=for-the-badge)](/LICENSE.md) [![Build status](https://img.shields.io/github/workflow/status/goreleaser/goreleaser/build?style=for-the-badge)](https://github.com/goreleaser/goreleaser/actions?workflow=build) -[![Codecov branch](https://img.shields.io/codecov/c/github/goreleaser/goreleaser/master.svg?style=for-the-badge)](https://codecov.io/gh/goreleaser/goreleaser) +[![Codecov branch](https://img.shields.io/codecov/c/github/goreleaser/goreleaser/main.svg?style=for-the-badge)](https://codecov.io/gh/goreleaser/goreleaser) [![Go Doc](https://img.shields.io/badge/godoc-reference-blue.svg?style=for-the-badge)](http://godoc.org/github.com/goreleaser/goreleaser) [![Powered By: GoReleaser](https://img.shields.io/badge/powered%20by-goreleaser-green.svg?style=for-the-badge)](https://github.com/goreleaser) [![Backers on Open Collective](https://opencollective.com/goreleaser/backers/badge.svg?style=for-the-badge)](https://opencollective.com/goreleaser/backers/) diff --git a/www/docs/contributing.md b/www/docs/contributing.md index 599a8c3fe..2124e5598 100644 --- a/www/docs/contributing.md +++ b/www/docs/contributing.md @@ -1,6 +1,6 @@ # Contributing -By participating to this project, you agree to abide our [code of conduct](https://github.com/goreleaser/goreleaser/blob/master/CODE_OF_CONDUCT.md). +By participating to this project, you agree to abide our [code of conduct](https://github.com/goreleaser/goreleaser/blob/main/CODE_OF_CONDUCT.md). ## Setup your machine @@ -62,8 +62,7 @@ You can follow the documentation on ## Submit a pull request -Push your branch to your `goreleaser` fork and open a pull request against the -master branch. +Push your branch to your `goreleaser` fork and open a pull request against the main branch. ## Financial contributions diff --git a/www/docs/customization/includes.md b/www/docs/customization/includes.md index 4b1a0abb8..4bb71fac9 100644 --- a/www/docs/customization/includes.md +++ b/www/docs/customization/includes.md @@ -13,7 +13,7 @@ includes: - from_file: path: ./config/goreleaser.yml - from_url: - url: https://raw.githubusercontent.com/goreleaser/goreleaser/master/.goreleaser.yml + url: https://raw.githubusercontent.com/goreleaser/goreleaser/main/.goreleaser.yml - from_url: url: caarlos0/goreleaserfiles/main/packages.yml # the https://raw.githubusercontent.com/ prefix may be ommited - from_url: diff --git a/www/docs/install.md b/www/docs/install.md index 812a38518..a5332cd0b 100644 --- a/www/docs/install.md +++ b/www/docs/install.md @@ -250,7 +250,7 @@ If you need more things, you are encouraged to keep your own image. You can always use GoReleaser's [own Dockerfile][dockerfile] as an example though and iterate from that. -[dockerfile]: https://github.com/goreleaser/goreleaser/blob/master/Dockerfile +[dockerfile]: https://github.com/goreleaser/goreleaser/blob/main/Dockerfile [releases]: https://github.com/goreleaser/goreleaser/releases [pro-releases]: https://github.com/goreleaser/goreleaser-pro/releases [cosign]: https://github.com/sigstore/cosign diff --git a/www/docs/links.md b/www/docs/links.md index 9ab5da0f1..1c4abfe03 100644 --- a/www/docs/links.md +++ b/www/docs/links.md @@ -6,8 +6,8 @@ - Ask questions on [StackOverflow](https://stackoverflow.com/questions/tagged/goreleaser) - For questions, support and general discussion, please use [GitHub Discussions](https://github.com/goreleaser/goreleaser/discussions); -- [Contributing Guidelines](https://github.com/goreleaser/goreleaser/blob/master/CONTRIBUTING.md) +- [Contributing Guidelines](https://github.com/goreleaser/goreleaser/blob/main/CONTRIBUTING.md) This project adheres to the Contributor Covenant -[code of conduct](https://github.com/goreleaser/goreleaser/blob/master/CODE_OF_CONDUCT.md). +[code of conduct](https://github.com/goreleaser/goreleaser/blob/main/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. diff --git a/www/mkdocs.yml b/www/mkdocs.yml index 076b353b7..3ddcaef81 100644 --- a/www/mkdocs.yml +++ b/www/mkdocs.yml @@ -4,7 +4,7 @@ site_description: Deliver Go binaries as fast and easily as possible copyright: Made with ❤️ by GoReleaser contributors. repo_name: goreleaser/goreleaser repo_url: https://github.com/goreleaser/goreleaser -edit_uri: edit/master/www/docs/ +edit_uri: edit/main/www/docs/ theme: name: material