From 392c504680deb50e92d50b61f364fe017102d411 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Thu, 14 Dec 2023 23:41:25 -0800
Subject: [PATCH 1/2] Run tests on CI using 6.4.0 and 7.0.0

---
 .github/workflows/ci.yaml             | 6 ++++++
 examples/simple-android/.bazelversion | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 examples/simple-android/.bazelversion

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ae7e1f4..4ae48ee 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,6 +21,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         bzlmod: [true]
+        bazel_version: ["6.4.0", "7.0.0"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: "Checkout the sources"
@@ -35,6 +36,8 @@ jobs:
       - name: "Setup Bazelisk"
         uses: bazelbuild/setup-bazelisk@v2
       - name: "Running tests //..."
+        env:
+          USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
         run: bazel test //... --enable_bzlmod=${{ matrix.bzlmod }}
   integration-tests:
     strategy:
@@ -43,6 +46,7 @@ jobs:
         bzlmod: [true]
         directory: [examples/simple-android]
         strategy: [local, worker]
+        bazel_version: ["6.4.0", "7.0.0"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: "Checkout the sources"
@@ -57,5 +61,7 @@ jobs:
       - name: "Setup Bazelisk"
         uses: bazelbuild/setup-bazelisk@v2
       - name: "Running integration tests ${{ matrix.directory }}"
+        env:
+          USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
         working-directory: ${{ matrix.directory }}
         run: bazel test //... --enable_bzlmod=${{ matrix.bzlmod }} --strategy=AndroidLint=${{ matrix.strategy }}
diff --git a/examples/simple-android/.bazelversion b/examples/simple-android/.bazelversion
deleted file mode 100644
index a585a9b..0000000
--- a/examples/simple-android/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-7.0.0-pre.20230724.1

From 4f1342297a23c2ab87ba7d9fdf9e6030a3c39741 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Fri, 15 Dec 2023 00:14:45 -0800
Subject: [PATCH 2/2] Build the examples with a single version

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4ae48ee..93a7007 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -46,7 +46,7 @@ jobs:
         bzlmod: [true]
         directory: [examples/simple-android]
         strategy: [local, worker]
-        bazel_version: ["6.4.0", "7.0.0"]
+        bazel_version: ["7.0.0"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: "Checkout the sources"