Skip to content

Commit

Permalink
fix: CI branch name master -> main (#398)
Browse files Browse the repository at this point in the history
Signed-off-by: Martijn Stevenson <[email protected]>
  • Loading branch information
martijneken authored Jun 7, 2024
1 parent 04dfb94 commit 611d5d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ on:

pull_request:
branches:
- master
- main
- 'envoy-release/**'
- 'istio-release/**'

push:
branches:
- master
- main
- 'envoy-release/**'
- 'istio-release/**'

Expand Down Expand Up @@ -145,11 +145,11 @@ jobs:
//...
- name: Skip Bazel cache update
if: ${{ github.ref != 'refs/heads/master' }}
if: ${{ github.ref != 'refs/heads/main' }}
run: echo "CACHE_SKIP_SAVE=true" >> $GITHUB_ENV

- name: Cleanup Bazel cache
if: ${{ github.ref == 'refs/heads/master' }}
if: ${{ github.ref == 'refs/heads/main' }}
run: |
export OUTPUT=$(${{ matrix.run_under }} bazel info output_base)
echo "===== BEFORE ====="
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ on:

pull_request:
branches:
- master
- main
- 'envoy-release/**'
- 'istio-release/**'

push:
branches:
- master
- main
- 'envoy-release/**'
- 'istio-release/**'

Expand Down Expand Up @@ -83,11 +83,11 @@ jobs:
retention-days: 3

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

- name: Cleanup Bazel cache
if: ${{ github.ref == 'refs/heads/master' }}
if: ${{ github.ref == 'refs/heads/main' }}
run: |
export OUTPUT=$(bazel info output_base)
# Distfiles for Rust toolchains (350 MiB).
Expand Down Expand Up @@ -341,11 +341,11 @@ jobs:
//test:signature_util_test
- name: Skip Bazel cache update
if: ${{ matrix.cache && github.ref != 'refs/heads/master' }}
if: ${{ matrix.cache && github.ref != 'refs/heads/main' }}
run: echo "CACHE_SKIP_SAVE=true" >> $GITHUB_ENV

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

0 comments on commit 611d5d9

Please sign in to comment.