change to USE_BAZEL_VERSION

Author: alexeagle

.github/workflows/ci.yaml

@@ -60,6 +60,9 @@ jobs:
         defaults:
             run:
                 working-directory: ${{ matrix.folder }}
+            env:
+              - USE_BAZEL_VERSION: ${{matrix.bazel-version.version}}
+
         strategy:
             fail-fast: false
             matrix:
@@ -149,25 +152,11 @@ jobs:
                       ~/.cache/bazelisk
                   key: >-
                       bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
-                      ${{ hashFiles('.bazelrc', '.bazelversion', '.bazeliskrc', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel', '**/*.js', '!e2e') }}-
-                      ${{ hashFiles(format('{0}/.bazelrc', matrix.folder), format('{0}/.bazelversion', matrix.folder), format('{0}/.bazeliskrc', matrix.folder), format('{0}/**/BUILD', matrix.folder), format('{0}/**/BUILD.bazel', matrix.folder), format('{0}/**/*.bzl', matrix.folder), format('{0}/WORKSPACE', matrix.folder), format('{0}/WORKSPACE.bazel', matrix.folder), format('{0}/WORKSPACE.bzlmod', matrix.folder), format('{0}/MODULE.bazel', matrix.folder), format('{0}/MODULE.bazel.lock', matrix.folder), format('{0}/**/*.js', matrix.folder)) }}
+                      ${{ hashFiles('.bazelrc', '.bazelversion', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel', '**/*.js', '!e2e') }}-
+                      ${{ hashFiles(format('{0}/.bazelrc', matrix.folder), format('{0}/.bazelversion', matrix.folder), format('{0}/**/BUILD', matrix.folder), format('{0}/**/BUILD.bazel', matrix.folder), format('{0}/**/*.bzl', matrix.folder), format('{0}/WORKSPACE', matrix.folder), format('{0}/WORKSPACE.bazel', matrix.folder), format('{0}/WORKSPACE.bzlmod', matrix.folder), format('{0}/MODULE.bazel', matrix.folder), format('{0}/MODULE.bazel.lock', matrix.folder), format('{0}/**/*.js', matrix.folder)) }}
                   restore-keys: |
                       bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
 
-            - name: Configure Bazel version
-              shell: bash
-              run: |
-                  # Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk
-                  # still bootstraps Aspect CLI from configuration in .bazeliskrc. Aspect CLI will
-                  # then use .bazelversion to determine which Bazel version to use.
-                  echo "${{ matrix.bazel-version.version }}" > .bazelversion
-
-            # TODO: remove this block once we have Aspect CLI Windows releases
-            - name: Don't use Aspect CLI on Windows
-              if: matrix.os == 'windows'
-              shell: bash
-              run: rm -f .bazeliskrc
-
             - name: bazel test //...
               shell: bash
               run: |
@@ -185,6 +174,10 @@ jobs:
         runs-on: ubuntu-latest
         needs:
             - matrix-prep
+        defaults:
+          env:
+            - USE_BAZEL_VERSION: ${{matrix.bazel-version.version}}
+
         strategy:
             fail-fast: false
             matrix:
@@ -197,13 +190,6 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - name: Configure Bazel version
-              working-directory: e2e/test
-              # Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk
-              # still bootstraps Aspect CLI from configuration in .bazeliskrc. Aspect CLI will
-              # then use .bazelversion to determine which Bazel version to use
-              run: echo "${{ matrix.bazel-version.version }}" > .bazelversion
-
             - name: Install Node.js
               uses: actions/setup-node@v3
               with: