From c87d0d236f95832ce048c3b7bc3b758056ac30ed Mon Sep 17 00:00:00 2001
From: Martijn Stevenson <mstevenson@google.com>
Date: Thu, 6 Jun 2024 20:05:48 +0000
Subject: [PATCH] fix: CI branch name master -> main

Signed-off-by: Martijn Stevenson <mstevenson@google.com>
---
 .github/workflows/format.yml |  8 ++++----
 .github/workflows/test.yml   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index a09aa7a64..0d7003e95 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -18,13 +18,13 @@ on:
 
   pull_request:
     branches:
-    - master
+    - main
     - 'envoy-release/**'
     - 'istio-release/**'
 
   push:
     branches:
-    - master
+    - main
     - 'envoy-release/**'
     - 'istio-release/**'
 
@@ -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 ====="
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d311c819..74e56f021 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,13 +18,13 @@ on:
 
   pull_request:
     branches:
-    - master
+    - main
     - 'envoy-release/**'
     - 'istio-release/**'
 
   push:
     branches:
-    - master
+    - main
     - 'envoy-release/**'
     - 'istio-release/**'
 
@@ -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).
@@ -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 ====="