diff --git a/.github/workflows/go-version.yml b/.github/workflows/go-version.yml index 7946ef046..281c09f25 100644 --- a/.github/workflows/go-version.yml +++ b/.github/workflows/go-version.yml @@ -3,7 +3,7 @@ name: Go version on: push: branches: - - master + - main paths: - Dockerfile diff --git a/.github/workflows/node-version.yml b/.github/workflows/node-version.yml index d9e883f67..28770f66f 100644 --- a/.github/workflows/node-version.yml +++ b/.github/workflows/node-version.yml @@ -3,7 +3,7 @@ name: Node version on: push: branches: - - master + - main paths: - Dockerfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc496902f..e05d0fb77 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,10 +3,10 @@ name: Test on: push: branches: - - master + - main pull_request: branches: - - master + - main release: types: - published @@ -34,7 +34,7 @@ jobs: path: ~/go/pkg/mod key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-go-modules-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-master-go-modules- + ${{ runner.os }}-main-go-modules- - name: Fetch all Go modules if: steps.cache-go-modules.outputs.cache-hit != 'true' @@ -73,7 +73,7 @@ jobs: path: ~/go/pkg/mod key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-go-modules-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-master-go-modules- + ${{ runner.os }}-main-go-modules- - name: Fetch all Go modules if: steps.cache-go-modules.outputs.cache-hit != 'true' @@ -112,7 +112,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-master-npm- + ${{ runner.os }}-main-npm- - name: Fetch all NPM dependencies if: steps.cache-npm.outputs.cache-hit != 'true' @@ -150,7 +150,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-master-npm- + ${{ runner.os }}-main-npm- - name: Fetch all NPM dependencies if: steps.cache-npm.outputs.cache-hit != 'true' @@ -199,7 +199,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-master-npm- + ${{ runner.os }}-main-npm- - name: Fetch all NPM dependencies if: steps.cache-npm.outputs.cache-hit != 'true' @@ -278,7 +278,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-master-npm- + ${{ runner.os }}-main-npm- - name: Fetch all NPM dependencies if: steps.cache-npm.outputs.cache-hit != 'true' @@ -390,7 +390,7 @@ jobs: path: ~/go/pkg/mod key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-go-modules-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-master-go-modules- + ${{ runner.os }}-main-go-modules- - name: Fetch all Go modules if: steps.cache-go-modules.outputs.cache-hit != 'true' @@ -439,7 +439,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-master-npm- + ${{ runner.os }}-main-npm- - name: Fetch all NPM dependencies if: steps.cache-npm.outputs.cache-hit != 'true' @@ -486,7 +486,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-master-npm- + ${{ runner.os }}-main-npm- - name: Fetch all NPM dependencies if: steps.cache-npm.outputs.cache-hit != 'true' @@ -531,7 +531,7 @@ jobs: ~/.npm key: ${{ runner.os }}-${{ env.GITHUB_REF_SLUG }}-go-cc-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-master-go-cc- + ${{ runner.os }}-main-go-cc- - name: Cross compile binaries run: make crosscompile -j 2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 813481fd5..ed41b7593 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ file. ## Git tags and branches Every release tag name will follow `vX.Y.Z` naming scheme, example: `v0.1.0`. -All releases are tagged against the `master` branch. +All releases are tagged against the `main` branch. ## Commit messages diff --git a/README.md b/README.md index c8e5ee9b4..5d37c2283 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ media queries. ## Demo -[Online demo](https://karma-demo.herokuapp.com/) is running latest master branch +[Online demo](https://karma-demo.herokuapp.com/) is running latest main branch or PR branch version. It might include features that are experimental and not yet ready to be included. @@ -243,7 +243,7 @@ Official docker images are built and hosted on Images are built automatically for: - release tags in git - `ghcr.io/prymitive/karma:vX.Y.Z` -- master branch commits - `ghcr.io/prymitive/karma:latest` +- main branch commits - `ghcr.io/prymitive/karma:latest` #### Examples @@ -254,11 +254,11 @@ To start a release image run: Latest release details can be found on [GitHub](https://github.com/prymitive/karma/releases). -To start docker image build from lastet master branch run: +To start docker image build from lastet main branch run: docker run -e ALERTMANAGER_URI=https://alertmanager.example.com ghcr.io/prymitive/karma:latest -Note that latest master branch might have bugs or breaking changes. Using +Note that latest main branch might have bugs or breaking changes. Using release images is strongly recommended for any production use. ### Building a Docker image diff --git a/make/go.mk b/make/go.mk index 61294a8f1..4d35d765a 100644 --- a/make/go.mk +++ b/make/go.mk @@ -36,7 +36,7 @@ benchmark-go: $(GOBIN)/benchstat: tools/benchstat/go.mod tools/benchstat/go.sum @$(GO) install -modfile=tools/benchstat/go.mod golang.org/x/perf/cmd/benchstat benchmark-compare-go: $(GOBIN)/benchstat - @$(GOBIN)/benchstat master.txt new.txt + @$(GOBIN)/benchstat main.txt new.txt $(GOBIN)/looppointer: tools/looppointer/go.mod tools/looppointer/go.sum $(GO) install -modfile=tools/looppointer/go.mod github.com/kyoh86/looppointer/cmd/looppointer diff --git a/scripts/ci-diff-benchmark-go.sh b/scripts/ci-diff-benchmark-go.sh index 04ba41e17..681c6eaa8 100755 --- a/scripts/ci-diff-benchmark-go.sh +++ b/scripts/ci-diff-benchmark-go.sh @@ -3,10 +3,10 @@ set -o errexit set -o pipefail -git fetch origin master +git fetch origin main git reset --hard FETCH_HEAD -make benchmark-go | tee master.txt +make benchmark-go | tee main.txt git reset --hard ${GITHUB_SHA} make benchmark-go | tee new.txt diff --git a/scripts/ci-diff-webpack.sh b/scripts/ci-diff-webpack.sh index 633fbeeca..61f5a0a08 100755 --- a/scripts/ci-diff-webpack.sh +++ b/scripts/ci-diff-webpack.sh @@ -3,15 +3,15 @@ set -o errexit set -o pipefail -git fetch origin master +git fetch origin main git reset --hard FETCH_HEAD make -C ui build/stats.json -mv ui/build/stats.json master.json +mv ui/build/stats.json main.json make clean git reset --hard ${GITHUB_SHA} make -C ui build/stats.json -./scripts/cra-bundle-stats-diff.py master.json ui/build/stats.json | tee diff.html +./scripts/cra-bundle-stats-diff.py main.json ui/build/stats.json | tee diff.html ./scripts/pr-comment.py "Webpack bundle size diff" diff.html html