Skip to content

Commit

Permalink
ci: set main as backend default branch (#1011)
Browse files Browse the repository at this point in the history
  • Loading branch information
sergebouchut2 authored May 3, 2022
1 parent d1a3922 commit 0f29b88
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conventional-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Conventional PR title"
on:
pull_request:
branches:
- "master"
- "main"
types:
- opened
- edited
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gcr-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Build connect-backend-metrics-exporter image
on:
push:
branches:
- master
- main
tags:
- '*'
pull_request:
branches:
- master
- main
paths:
- 'docker/metrics-exporter/*'
- 'metrics-exporter/**'
Expand All @@ -20,7 +20,7 @@ jobs:

- name: Set env variables
run: |
if [ "${{ github.ref }}" = "refs/heads/master" ]; then
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
echo "LATEST=true" >> $GITHUB_ENV
echo "LATEST is set to true"
echo "BACKEND_VERSION=latest+`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Build connect backend image
on:
push:
branches:
- master
- main
tags:
- '*'
pull_request:
branches:
- master
- main
paths:
- 'docker/connect-backend/*'
- 'backend/**'
Expand All @@ -21,7 +21,7 @@ jobs:

- name: Set env variables
run: |
if [ "${{ github.ref }}" = "refs/heads/master" ]; then
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
echo "LATEST=true" >> $GITHUB_ENV
echo "LATEST is set to true"
echo "BACKEND_VERSION=latest+`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Hadolint
on:
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "**"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Helm
on:
push:
branches:
- "master"
- "main"
paths:
- "charts/**"
pull_request:
branches:
- "master"
- "main"
paths:
- "charts/**"

Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
publish:
name: Publish
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
needs:
- test
- generate-chart-readme
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Python
on:
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "**"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sub-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches:
- '**'
- '!master'
- '!main'
types:
- opened
- edited
Expand Down

0 comments on commit 0f29b88

Please sign in to comment.