From fcbeea9bd593ae19148cb6250e70d620c4eb122e Mon Sep 17 00:00:00 2001
From: Misha Brukman <mbrukman@google.com>
Date: Fri, 24 May 2024 18:45:12 -0400
Subject: [PATCH] Switch from setup-bazelisk to setup-bazel

bazelbuild/setup-bazelisk was deprecated, and it recommends using
bazel-contrib/setup-bazel going forward.

Also added a global `USE_BAZEL_VERSION` to specify the required Bazel version to
use for builds and tests.
---
 .github/workflows/main.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 93794ff..d94b825 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,22 +24,30 @@ jobs:
   build:
     strategy:
       matrix:
+        bazel: [ '6.0.0' ]
         os: [ 'ubuntu-22.04', 'macos-12' ]
 
-    name: Running on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    name: Running on ${{ matrix.os }}
+    env:
+      USE_BAZEL_VERSION: ${{ matrix.bazel }}
+
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Install Bazelisk
-        uses: bazelbuild/setup-bazelisk@v3
-
-      - name: Setup cache for Bazel
-        uses: actions/cache@v4
+      - name: Setup Bazel
+        uses: bazel-contrib/setup-bazel@0.8.4
         with:
-          path: "~/.cache/bazel"
-          key: bazel
+          # Avoid downloading Bazel every time.
+          bazelisk-cache: true
+          # Store build cache per workflow.
+          disk-cache: ${{ github.workflow }}
+          # Share repository cache between workflows.
+          repository-cache: true
+
+      - name: Verify Bazel installation
+        run: bazel version
 
       - name: Build
         run: bazel build --config=ci //...