Skip to content

Commit 611d5d9

Browse files
authored
fix: CI branch name master -> main (#398)
Signed-off-by: Martijn Stevenson <[email protected]>
1 parent 04dfb94 commit 611d5d9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/format.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ on:
1818

1919
pull_request:
2020
branches:
21-
- master
21+
- main
2222
- 'envoy-release/**'
2323
- 'istio-release/**'
2424

2525
push:
2626
branches:
27-
- master
27+
- main
2828
- 'envoy-release/**'
2929
- 'istio-release/**'
3030

@@ -145,11 +145,11 @@ jobs:
145145
//...
146146
147147
- name: Skip Bazel cache update
148-
if: ${{ github.ref != 'refs/heads/master' }}
148+
if: ${{ github.ref != 'refs/heads/main' }}
149149
run: echo "CACHE_SKIP_SAVE=true" >> $GITHUB_ENV
150150

151151
- name: Cleanup Bazel cache
152-
if: ${{ github.ref == 'refs/heads/master' }}
152+
if: ${{ github.ref == 'refs/heads/main' }}
153153
run: |
154154
export OUTPUT=$(${{ matrix.run_under }} bazel info output_base)
155155
echo "===== BEFORE ====="

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ on:
1818

1919
pull_request:
2020
branches:
21-
- master
21+
- main
2222
- 'envoy-release/**'
2323
- 'istio-release/**'
2424

2525
push:
2626
branches:
27-
- master
27+
- main
2828
- 'envoy-release/**'
2929
- 'istio-release/**'
3030

@@ -83,11 +83,11 @@ jobs:
8383
retention-days: 3
8484

8585
- name: Skip Bazel cache update
86-
if: ${{ github.ref != 'refs/heads/master' }}
86+
if: ${{ github.ref != 'refs/heads/main' }}
8787
run: echo "CACHE_SKIP_SAVE=true" >> $GITHUB_ENV
8888

8989
- name: Cleanup Bazel cache
90-
if: ${{ github.ref == 'refs/heads/master' }}
90+
if: ${{ github.ref == 'refs/heads/main' }}
9191
run: |
9292
export OUTPUT=$(bazel info output_base)
9393
# Distfiles for Rust toolchains (350 MiB).
@@ -341,11 +341,11 @@ jobs:
341341
//test:signature_util_test
342342
343343
- name: Skip Bazel cache update
344-
if: ${{ matrix.cache && github.ref != 'refs/heads/master' }}
344+
if: ${{ matrix.cache && github.ref != 'refs/heads/main' }}
345345
run: echo "CACHE_SKIP_SAVE=true" >> $GITHUB_ENV
346346

347347
- name: Cleanup Bazel cache
348-
if: ${{ matrix.cache && github.ref == 'refs/heads/master' }}
348+
if: ${{ matrix.cache && github.ref == 'refs/heads/main' }}
349349
run: |
350350
export OUTPUT=$(${{ matrix.run_under }} bazel info output_base)
351351
echo "===== BEFORE ====="

0 commit comments

Comments
 (0)