diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ce198cc..d69900c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,9 +4,9 @@ Describe the use case and detail of the change. If this PR addresses an issue on ### Checklist Before creating a PR, run through this checklist and mark each as complete. -- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-plus-go-client/blob/master/CONTRIBUTING.md) doc +- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-plus-go-client/blob/main/CONTRIBUTING.md) doc - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have checked that all unit tests pass after adding my changes - [ ] I have updated necessary documentation -- [ ] I have rebased my branch onto master -- [ ] I will ensure my PR is targeting the master branch and pulling from my branch from my own fork +- [ ] I have rebased my branch onto main +- [ ] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f8828a..a7437a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,13 +3,13 @@ name: Continuous Integration on: push: branches: - - master + - main paths-ignore: - '**.md' - 'LICENSE' pull_request: branches: - - master + - main paths-ignore: - '**.md' - 'LICENSE' @@ -69,7 +69,7 @@ jobs: name: Notify runs-on: ubuntu-20.04 needs: build - if: always() && github.ref == 'refs/heads/master' + if: always() && github.ref == 'refs/heads/main' steps: - name: Workflow Status id: check diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bcfeb10..3b60292 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '33 16 * * 3' diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 23e4ad0..e869a15 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -3,7 +3,7 @@ name: Fossa on: push: branches: - - master + - main paths-ignore: - '**.md' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cb4ae38..9abe86b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,7 @@ name: Lint on: pull_request: branches: - - master + - main paths-ignore: - '**.md' - 'LICENSE' diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index b3e46a4..5591400 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - master + - main pull_request: types: [opened, reopened, synchronize] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 746316f..76ebd60 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ The following is a set of guidelines for contributing to the NGINX Plus Go Clien * [Git Style Guide](#git-style-guide) * [Go Style Guide](#go-style-guide) -[Code of Conduct](https://github.com/nginxinc/nginx-plus-go-client/blob/master/CODE_OF_CONDUCT.md) +[Code of Conduct](https://github.com/nginxinc/nginx-plus-go-client/blob/main/CODE_OF_CONDUCT.md) ## Ask a Question @@ -60,4 +60,4 @@ Note: if you’d like to implement a new feature, please consider creating a fea * Run `gofmt` over your code to automatically resolve a lot of style issues. Most editors support this running automatically when saving a code file. * Run `go lint` and `go vet` on your code too to catch any other issues. * Follow this guide on some good practice and idioms for Go - https://github.com/golang/go/wiki/CodeReviewComments -* To check for extra issues, install [golangci-lint](https://github.com/golangci/golangci-lint) and run `make lint` or `golangci-lint run` \ No newline at end of file +* To check for extra issues, install [golangci-lint](https://github.com/golangci/golangci-lint) and run `make lint` or `golangci-lint run`