From fe2d31870c6f658ca8769a448af898cf378e4455 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Tue, 7 Nov 2023 14:01:45 -0800
Subject: [PATCH] chore: green up Windows CI (#643)

---
 .bazeliskrc                                |  2 +-
 .bcr/presubmit.yml                         |  2 ++
 .github/workflows/ci.yaml                  | 10 ++++++----
 e2e/copy_to_directory/.bazeliskrc          |  1 +
 e2e/coreutils/.bazeliskrc                  |  1 +
 e2e/external_copy_to_directory/.bazeliskrc |  1 +
 e2e/smoke/.bazeliskrc                      |  1 +
 e2e/write_source_files/.bazeliskrc         |  1 +
 8 files changed, 14 insertions(+), 5 deletions(-)
 create mode 120000 e2e/copy_to_directory/.bazeliskrc
 create mode 120000 e2e/coreutils/.bazeliskrc
 create mode 120000 e2e/external_copy_to_directory/.bazeliskrc
 create mode 120000 e2e/smoke/.bazeliskrc
 create mode 120000 e2e/write_source_files/.bazeliskrc

diff --git a/.bazeliskrc b/.bazeliskrc
index a28c887..f65dec0 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.8.5
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index 34333e3..44a5037 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -6,5 +6,7 @@ bcr_test_module:
     run_tests:
       name: "Run test module"
       platform: ${{ platform }}
+      environment:
+        BAZELISK_BASE_URL: "https://github.com/bazelbuild/bazel/releases/download/"
       test_targets:
         - "//..."
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index aa8913d..3f4d5d7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -121,10 +121,10 @@ jobs:
       - name: Configure Bazel version
         if: ${{ matrix.os != 'windows-latest' }}
         working-directory: ${{ matrix.folder }}
-        # Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk
+        # - 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.
-        # Also delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing
+        # - Delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing
         # against Bazel 6 which has a try-import in the root .bazelrc for local development.
         run: |
           BAZEL_VERSION=${{ matrix.bazelversion }}
@@ -134,17 +134,19 @@ jobs:
       - name: Configure Bazel version (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
         working-directory: ${{ matrix.folder }}
-        # Overwrite the .bazelversion instead of using USE_BAZEL_VERSION so that Bazelisk
+        # - 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.
-        # Also delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing
+        # - Delete the .aspect/bazelrc/bazel6.bazelrc file if we are not testing
         # against Bazel 6 which has a try-import in the root .bazelrc for local development.
+        # - Delete the .bazeliskrc file since Aspect CLI doesn't current ship Windows binaries
         run: |
           echo "${{ matrix.bazelversion }}" > .bazelversion
           $BAZEL_MAJOR_VERSION = "${{ matrix.bazelversion }}".substring(0, 1)
           if ($BAZEL_MAJOR_VERSION -ne "6") {
             rm -Force .aspect/bazelrc/bazel6.bazelrc
           }
+          rm -Force .bazeliskrc
 
       - name: Set bzlmod flag
         # Store the --enable_bzlmod flag that we add to the test command below
diff --git a/e2e/copy_to_directory/.bazeliskrc b/e2e/copy_to_directory/.bazeliskrc
new file mode 120000
index 0000000..0fbe20f
--- /dev/null
+++ b/e2e/copy_to_directory/.bazeliskrc
@@ -0,0 +1 @@
+../../.bazeliskrc
\ No newline at end of file
diff --git a/e2e/coreutils/.bazeliskrc b/e2e/coreutils/.bazeliskrc
new file mode 120000
index 0000000..0fbe20f
--- /dev/null
+++ b/e2e/coreutils/.bazeliskrc
@@ -0,0 +1 @@
+../../.bazeliskrc
\ No newline at end of file
diff --git a/e2e/external_copy_to_directory/.bazeliskrc b/e2e/external_copy_to_directory/.bazeliskrc
new file mode 120000
index 0000000..0fbe20f
--- /dev/null
+++ b/e2e/external_copy_to_directory/.bazeliskrc
@@ -0,0 +1 @@
+../../.bazeliskrc
\ No newline at end of file
diff --git a/e2e/smoke/.bazeliskrc b/e2e/smoke/.bazeliskrc
new file mode 120000
index 0000000..0fbe20f
--- /dev/null
+++ b/e2e/smoke/.bazeliskrc
@@ -0,0 +1 @@
+../../.bazeliskrc
\ No newline at end of file
diff --git a/e2e/write_source_files/.bazeliskrc b/e2e/write_source_files/.bazeliskrc
new file mode 120000
index 0000000..0fbe20f
--- /dev/null
+++ b/e2e/write_source_files/.bazeliskrc
@@ -0,0 +1 @@
+../../.bazeliskrc
\ No newline at end of file