File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed
Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ _Run once only during `zero apply`_
2626## On-going
2727### Pull request
2828- Unit test
29- ### Push to master branch
29+ ### Push to master/main branch
3030- Unit test
3131- Build docker image
3232- Deploy image to Staging cluster using Kustomize
Original file line number Diff line number Diff line change 3434 # # Branch Protect for PRs
3535 # # By default we setup Pull-request checks of [lint, unit-test] in `.github/workflows/pull-request.yml`
3636 # # And we will enforce both the checks pass before PR can be merged into default branch
37- DEFAULT_BRANCH=master
37+ DEFAULT_BRANCH=` git config --get init.defaultBranch || echo main `
3838 curl -XPUT " https://api.github.com/repos/$GITHUB_ORG /$GITHUB_REPO /branches/$DEFAULT_BRANCH /protection" \
3939 --header " Authorization: token $GITHUB_ACCESS_TOKEN " \
4040 --header ' Content-Type: application/json' \
Original file line number Diff line number Diff line change @@ -291,7 +291,7 @@ workflows:
291291 filters :
292292 branches :
293293 only : # only branches matching the below regex filters will run
294- - /^master$/
294+ - /^( master|main) $/
295295
296296 - deploy :
297297 name : deploy_staging
You can’t perform that action at this time.
0 commit comments