From 8e45659aa616800c13c2391f45de3b0ebd5063fc Mon Sep 17 00:00:00 2001
From: Greg Magolan <greg@aspect.dev>
Date: Sun, 28 Apr 2024 11:33:50 -0700
Subject: [PATCH] chore: bump to Bazel 7

---
 .bazeliskrc               |  2 +-
 .bazelversion             |  2 +-
 .github/workflows/ci.yaml |  3 +--
 .gitignore                | 11 ++++++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.bazeliskrc b/.bazeliskrc
index a28c887..269fbb0 100644
--- a/.bazeliskrc
+++ b/.bazeliskrc
@@ -1,2 +1,2 @@
 BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download
-USE_BAZEL_VERSION=aspect/5.7.2
+USE_BAZEL_VERSION=aspect/5.9.25
diff --git a/.bazelversion b/.bazelversion
index 6c7efdc..2b1ea10 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,4 +1,4 @@
-6.3.2
+7.1.1
 # The first line of this file is used by Bazelisk and Bazel to be sure
 # the right version of Bazel is used to build and test this repo.
 # This also defines which version is used on CI.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 736adca..cc750e9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,8 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # TODO(alex): add testing on Bazel 7
-      - id: bazel_6
+      - id: bazel_7
         run: echo "bazelversion=$(head -n 1 .bazelversion)" >> $GITHUB_OUTPUT
     outputs:
       # Will look like ["<version from .bazelversion>", ...]
diff --git a/.gitignore b/.gitignore
index 47ddd74..1a4a203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,13 @@ dist
 node_modules
 .DS_Store
 aspect-build-webpack-*
-.bazelrc.user
\ No newline at end of file
+.bazelrc.user
+
+# Don't commit lockfile for now as it is unstable. Do allow for it to be
+# created, however, since it gives a performance boost for local development.
+# https://github.com/bazelbuild/bazel/issues/19026
+# https://github.com/bazelbuild/bazel/issues/19621
+# https://github.com/bazelbuild/bazel/issues/19971
+# https://github.com/bazelbuild/bazel/issues/20272
+# https://github.com/bazelbuild/bazel/issues/20369
+MODULE.bazel.lock