From dca306d87fb1da0ee71e09623dea0189b6cb826f Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Mon, 22 Aug 2022 14:57:00 +0530 Subject: [PATCH] Change default branch to main across repository (#2514) Signed-off-by: Sanket Sudake --- .github/workflows/codeql.yaml | 4 ++-- .github/workflows/lint.yaml | 4 ++-- .github/workflows/push_pr.yaml | 4 ++-- .github/workflows/upgrade_test.yaml | 4 ++-- .mergify.yml | 2 +- README.md | 4 ++-- hack/Releasing.md | 8 ++++---- hack/notes.md | 2 +- hack/release.sh | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 8c1b3384..cb208af4 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -3,14 +3,14 @@ name: Code Scanning on: push: branches: - - master + - main paths: - '**.go' - go.mod - go.sum pull_request: branches: - - master + - main paths: - '**.go' - go.mod diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index decf34f3..d3c81d04 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -3,14 +3,14 @@ name: Lint and Unit tests on: push: branches: - - master + - main paths: - '**.go' - go.mod - go.sum pull_request: branches: - - master + - main paths: - '**.go' - go.mod diff --git a/.github/workflows/push_pr.yaml b/.github/workflows/push_pr.yaml index b00b2dba..3342d023 100644 --- a/.github/workflows/push_pr.yaml +++ b/.github/workflows/push_pr.yaml @@ -3,7 +3,7 @@ name: Fission CI on: push: branches: - - master + - main paths: - "**.go" - "charts/**" @@ -12,7 +12,7 @@ on: - go.sum pull_request: branches: - - master + - main paths: - "**.go" - "charts/**" diff --git a/.github/workflows/upgrade_test.yaml b/.github/workflows/upgrade_test.yaml index 48da4acb..83400912 100644 --- a/.github/workflows/upgrade_test.yaml +++ b/.github/workflows/upgrade_test.yaml @@ -3,7 +3,7 @@ name: Fission CI upgrade on: push: branches: - - master + - main paths: - '**.go' - 'charts/**' @@ -12,7 +12,7 @@ on: - go.sum pull_request: branches: - - master + - main paths: - '**.go' - 'charts/**' diff --git a/.mergify.yml b/.mergify.yml index c7697989..daea0925 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: Automatic merge on approval conditions: - - base=master + - base=main - "#approved-reviews-by>=1" - label=ready-to-merge - label!=hold-off-merging diff --git a/README.md b/README.md index 7711f02c..8d5e52d1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

- + Fission Licence @@ -20,7 +20,7 @@ Fission contributors - + Commit Activity
diff --git a/hack/Releasing.md b/hack/Releasing.md index 7ff09dab..d9509536 100644 --- a/hack/Releasing.md +++ b/hack/Releasing.md @@ -55,11 +55,11 @@ Fix the build if it is not green. DON'T proceed unless build is GREEN! 6. Push this release-x.y.z branch to remote repo. Create a PR and wait for CI passed. -7. Now manually merge the release-x.y.z branch into master branch with Git command to prevent the commit SHA from being changed. +7. Now manually merge the release-x.y.z branch into main branch with Git command to prevent the commit SHA from being changed. - `git checkout master && git merge --ff-only release-` + `git checkout main && git merge --ff-only release-` -8. Test build from master branch for sanity check and make sure the master build is green +8. Test build from main branch for sanity check and make sure the main build is green ## Updating [Fission Charts](https://github.com/fission/fission-charts) @@ -80,7 +80,7 @@ Before you save the release - UNCHECK the "This is a pre-release" checkbox. This 1. Documentation Update -a. Merge documentation PRs that are peer reviewed and get latest master locally. +a. Merge documentation PRs that are peer reviewed and get latest main locally. b. In the repo fission/fission.io change version in version.sh file to latest version (x.y.z) and run build.sh script diff --git a/hack/notes.md b/hack/notes.md index 6c211c47..3172fc31 100644 --- a/hack/notes.md +++ b/hack/notes.md @@ -1,2 +1,2 @@ Install Guide: https://fission.io/docs/installation/ -Full Changelog: https://github.com/fission/fission/blob/master/CHANGELOG.md \ No newline at end of file +Full Changelog: https://github.com/fission/fission/blob/main/CHANGELOG.md \ No newline at end of file diff --git a/hack/release.sh b/hack/release.sh index 75008235..9848bdf1 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -22,8 +22,8 @@ check_commands() { # Ensure we're on the master branch check_branch() { curr_branch=$(git rev-parse --abbrev-ref HEAD) - if [ "$curr_branch" != "master" ]; then - echo "Not on master branch." + if [ "$curr_branch" != "main" ]; then + echo "Not on main branch." exit 1 fi echo "check_branch == PASSED"