Change default branch to main across repository (#2514)

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2022-08-22 14:57:00 +05:30
committed by GitHub
parent 3b4211b581
commit dca306d87f
9 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -3,14 +3,14 @@ name: Code Scanning
on: on:
push: push:
branches: branches:
- master - main
paths: paths:
- '**.go' - '**.go'
- go.mod - go.mod
- go.sum - go.sum
pull_request: pull_request:
branches: branches:
- master - main
paths: paths:
- '**.go' - '**.go'
- go.mod - go.mod
+2 -2
View File
@@ -3,14 +3,14 @@ name: Lint and Unit tests
on: on:
push: push:
branches: branches:
- master - main
paths: paths:
- '**.go' - '**.go'
- go.mod - go.mod
- go.sum - go.sum
pull_request: pull_request:
branches: branches:
- master - main
paths: paths:
- '**.go' - '**.go'
- go.mod - go.mod
+2 -2
View File
@@ -3,7 +3,7 @@ name: Fission CI
on: on:
push: push:
branches: branches:
- master - main
paths: paths:
- "**.go" - "**.go"
- "charts/**" - "charts/**"
@@ -12,7 +12,7 @@ on:
- go.sum - go.sum
pull_request: pull_request:
branches: branches:
- master - main
paths: paths:
- "**.go" - "**.go"
- "charts/**" - "charts/**"
+2 -2
View File
@@ -3,7 +3,7 @@ name: Fission CI upgrade
on: on:
push: push:
branches: branches:
- master - main
paths: paths:
- '**.go' - '**.go'
- 'charts/**' - 'charts/**'
@@ -12,7 +12,7 @@ on:
- go.sum - go.sum
pull_request: pull_request:
branches: branches:
- master - main
paths: paths:
- '**.go' - '**.go'
- 'charts/**' - 'charts/**'
+1 -1
View File
@@ -1,7 +1,7 @@
pull_request_rules: pull_request_rules:
- name: Automatic merge on approval - name: Automatic merge on approval
conditions: conditions:
- base=master - base=main
- "#approved-reviews-by>=1" - "#approved-reviews-by>=1"
- label=ready-to-merge - label=ready-to-merge
- label!=hold-off-merging - label!=hold-off-merging
+2 -2
View File
@@ -5,7 +5,7 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://github.com/fission/fission/blob/master/LICENSE"> <a href="https://github.com/fission/fission/blob/main/LICENSE">
<img alt="Fission Licence" src="https://img.shields.io/github/license/fission/fission"> <img alt="Fission Licence" src="https://img.shields.io/github/license/fission/fission">
</a> </a>
<a href="https://github.com/fission/fission/releases"> <a href="https://github.com/fission/fission/releases">
@@ -20,7 +20,7 @@
<a href="https://github.com/fission/fission/graphs/contributors"> <a href="https://github.com/fission/fission/graphs/contributors">
<img alt="Fission contributors" src="https://img.shields.io/github/contributors/fission/fission"> <img alt="Fission contributors" src="https://img.shields.io/github/contributors/fission/fission">
</a> </a>
<a href="https://github.com/fission/fission/commits/master"> <a href="https://github.com/fission/fission/commits/main">
<img alt="Commit Activity" src="https://img.shields.io/github/commit-activity/m/fission/fission"> <img alt="Commit Activity" src="https://img.shields.io/github/commit-activity/m/fission/fission">
</a> </a>
<br> <br>
+4 -4
View File
@@ -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. 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-<VERSION>` `git checkout main && git merge --ff-only release-<VERSION>`
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) ## 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 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 b. In the repo fission/fission.io change version in version.sh file to latest version (x.y.z) and run build.sh script
+1 -1
View File
@@ -1,2 +1,2 @@
Install Guide: https://fission.io/docs/installation/ Install Guide: https://fission.io/docs/installation/
Full Changelog: https://github.com/fission/fission/blob/master/CHANGELOG.md Full Changelog: https://github.com/fission/fission/blob/main/CHANGELOG.md
+2 -2
View File
@@ -22,8 +22,8 @@ check_commands() {
# Ensure we're on the master branch # Ensure we're on the master branch
check_branch() { check_branch() {
curr_branch=$(git rev-parse --abbrev-ref HEAD) curr_branch=$(git rev-parse --abbrev-ref HEAD)
if [ "$curr_branch" != "master" ]; then if [ "$curr_branch" != "main" ]; then
echo "Not on master branch." echo "Not on main branch."
exit 1 exit 1
fi fi
echo "check_branch == PASSED" echo "check_branch == PASSED"