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 @@
-
+
@@ -20,7 +20,7 @@
-
+
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-