From 90e92c8718e11be01acb2024f4559ce78dfd3993 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Wed, 15 Jul 2026 21:35:37 +0100
Subject: [PATCH] Switch to bazel-contrib/setup-bazel

---
 .github/workflows/buildifier.yaml |  6 ++++++
 .github/workflows/ci.yaml         | 26 ++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/buildifier.yaml b/.github/workflows/buildifier.yaml
index 6dcf0cf..7c609b9 100644
--- a/.github/workflows/buildifier.yaml
+++ b/.github/workflows/buildifier.yaml
@@ -15,5 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
+      - name: Setup Bazel
+        uses: bazel-contrib/setup-bazel@0.19.0
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
       - name: buildifier
         run: bazel run --enable_bzlmod //.github/workflows:buildifier.check
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d9e16ee..e8baa13 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,15 +27,12 @@ jobs:
     steps:
       - name: "Checkout the sources"
         uses: actions/checkout@v7
-      - name: Mount bazel caches
-        uses: actions/cache@v6
+      - name: Setup Bazel
+        uses: bazel-contrib/setup-bazel@0.19.0
         with:
-          path: |
-            ~/.cache/bazel
-          key: bazel-cache-${{ hashFiles('**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel') }}
-          restore-keys: bazel-cache-
-      - name: "Setup Bazelisk"
-        uses: bazelbuild/setup-bazelisk@v3
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}-${{ matrix.bazel_version }}
+          repository-cache: true
       - name: "Running tests //..."
         env:
           USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
@@ -51,15 +48,12 @@ jobs:
     steps:
       - name: "Checkout the sources"
         uses: actions/checkout@v7
-      - name: Mount bazel caches
-        uses: actions/cache@v6
+      - name: Setup Bazel
+        uses: bazel-contrib/setup-bazel@0.19.0
         with:
-          path: |
-            ~/.cache/bazel
-          key: bazel-cache-${{ hashFiles('**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel') }}
-          restore-keys: bazel-cache-
-      - name: "Setup Bazelisk"
-        uses: bazelbuild/setup-bazelisk@v3
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}-${{ matrix.bazel_version }}
+          repository-cache: true
       - name: "Running integration tests ${{ matrix.directory }}"
         env:
           USE_BAZEL_VERSION: ${{ matrix.bazel_version }}