ci: fix windows testing

Author: jbedard

.aspect/workflows/bazelrc

@@ -1,3 +1,2 @@
-# build without the bytes
-common --remote_download_outputs=minimal
-common --nobuild_runfile_links
+# Flags for Aspect Workflows are provided by tools/preset.bazelrc via each workspace's .bazelrc
+# and activated by --config=ci in .aspect/workflows/config.yaml bazel.flags

.aspect/workflows/config.yaml

@@ -3,45 +3,102 @@ workspaces:
     .:
         icon: webpack
         label: rules_webpack
+        tasks:
+            # Root repository is bzlmod-only
+            - bazel-7-no-bzlmod:
+                  without: true
     e2e/loaders:
         icon: bazel
         tasks:
-            - test:
-                  queue: aspect-medium
+            # loaders only has WORKSPACE (no MODULE.bazel)
+            - bazel-7:
+                  without: true
+            - bazel-8:
+                  without: true
+            - bazel-9:
+                  without: true
             - buildifier:
                   without: true
     e2e/loaders_jslib:
         icon: bazel
         tasks:
-            - test:
-                  queue: aspect-medium
+            # loaders_jslib only has WORKSPACE (no MODULE.bazel)
+            - bazel-7:
+                  without: true
+            - bazel-8:
+                  without: true
+            - bazel-9:
+                  without: true
             - buildifier:
                   without: true
     e2e/smoke:
         icon: bazel
         tasks:
-            - test:
-                  queue: aspect-medium
             - buildifier:
                   without: true
     e2e/smoke_rjs3:
         icon: bazel
         tasks:
-            - test:
-                  queue: aspect-medium
+            # smoke_rjs3 is bzlmod-only
+            - bazel-7-no-bzlmod:
+                  without: true
             - buildifier:
                   without: true
     e2e/worker:
         icon: bazel
         tasks:
-            - test:
-                  queue: aspect-medium
+            # worker MODULE.bazel not yet migrated (TODO)
+            - bazel-7:
+                  without: true
+            - bazel-8:
+                  without: true
+            - bazel-9:
+                  without: true
             - buildifier:
                   without: true
+bazel:
+    flags:
+        - --config=ci
 tasks:
     - checkout:
           update_strategy: rebase
     - test:
+          name: Bazel 7
+          id: bazel-7
+          bazel:
+              flags:
+                  - --test_tag_filters=-skip-on-bazel7
+                  - --build_tag_filters=-skip-on-bazel7
+          env:
+              USE_BAZEL_VERSION: 7.x
+    - test:
+          name: Bazel 7 (no bzlmod)
+          id: bazel-7-no-bzlmod
+          bazel:
+              flags:
+                  - --noenable_bzlmod
+                  - --test_tag_filters=-skip-on-bazel7
+                  - --build_tag_filters=-skip-on-bazel7
+          env:
+              USE_BAZEL_VERSION: 7.x
+    - test:
+          name: Bazel 8
+          id: bazel-8
+          bazel:
+              flags:
+                  - --test_tag_filters=-skip-on-bazel8
+                  - --build_tag_filters=-skip-on-bazel8
+          env:
+              USE_BAZEL_VERSION: 8.x
+    - test:
+          name: Bazel 9
+          id: bazel-9
+          bazel:
+              flags:
+                  - --test_tag_filters=-skip-on-bazel9
+                  - --build_tag_filters=-skip-on-bazel9
+          env:
+              USE_BAZEL_VERSION: 9.x
     - buildifier:
           queue: aspect-medium
     - finalization:

.github/workflows/BUILD.bazel

@@ -1,9 +1,2 @@
-load("@aspect_bazel_lib//lib:bazelrc_presets.bzl", "write_aspect_bazelrc_presets")
-
-write_aspect_bazelrc_presets(
-    name = "update_aspect_bazelrc_presets",
-    presets = [
-        "bazel6",
-        "bazel7",
-    ],
-)
+# Intentionally empty - bazelrc presets are generated by //tools:preset
+# See tools/BUILD.bazel which uses bazelrc-preset.bzl to generate tools/preset.bazelrc

.github/workflows/bazel6.bazelrc

@@ -2,8 +2,5 @@
 common --disk_cache=~/.cache/bazel-disk-cache
 common --repository_cache=~/.cache/bazel-repository-cache
 
-# Debug where options came from
-common --announce_rc
-
 # Allows tests to run bazelisk-in-bazel, since this is the cache folder used
 common --test_env=XDG_CACHE_HOME

.github/workflows/bazel7.bazelrc

@@ -18,65 +18,25 @@ concurrency:
   cancel-in-progress: ${{ github.ref_name != 'main' }}
 
 jobs:
-  # Prepares dynamic test matrix values
-  matrix-prep:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - id: bazel-version
-        name: Prepare 'bazel-version' matrix axis
-        run: |
-          v=$(head -n 1 .bazelversion)
-          m=${v::1}
-          a=(
-            "major:$m, version:\"$v\""
-            "major:6, version:\"6.5.0\""
-          )
-          printf -v j '{%s},' "${a[@]}"
-          echo "res=[${j%,}]" | tee -a $GITHUB_OUTPUT
-      - id: os
-        name: Prepare 'os' matrix axis
-        # Only run MacOS and Windows on main branch (not PRs) to minimize minutes (billed at 10X and 2X respectively)
-        # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#included-storage-and-minutes
-        run: |
-          a=( ubuntu )
-          if [[ "${{ github.ref_name }}" == "main" ]] || [[ "${{ github.head_ref }}" == *"macos"* ]]; then
-            a+=( macos )
-          fi
-          if [[ "${{ github.ref_name }}" == "main" ]] || [[ "${{ github.head_ref }}" == *"windows"* ]]; then
-            a+=( windows )
-          fi
-          printf -v j '"%s",' "${a[@]}"
-          echo "res=[${j%,}]" | tee -a $GITHUB_OUTPUT
-    outputs:
-      bazel-version: ${{ steps.bazel-version.outputs.res }}
-      os: ${{ steps.os.outputs.res }}
-
+  # Mac/Windows smoke tests
+  # Linux tests are run on Aspect Workflows (see .aspect/workflows/config.yaml)
+  # Only run on main branch (not PRs) to minimize minutes (billed at 10X and 2X respectively)
+  # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#included-storage-and-minutes
   test:
+    if: github.ref_name == 'main' || contains(github.head_ref, 'macos') || contains(github.head_ref, 'windows')
     runs-on: ${{ matrix.os }}-latest
-    needs:
-      - matrix-prep
     strategy:
       fail-fast: false
       matrix:
-        bazel-version: ${{ fromJSON(needs.matrix-prep.outputs.bazel-version) }}
         bzlmod: [1, 0]
-        os: ${{ fromJSON(needs.matrix-prep.outputs.os) }}
+        os: [macos, windows]
         folder:
           - '.'
           - 'e2e/loaders'
           - 'e2e/smoke'
           - 'e2e/smoke_rjs3'
           - 'e2e/worker'
         exclude:
-          # Don't test MacOS and Windows against secondary bazel version to minimize minutes (billed at 10X and 2X respectively)
-          # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#included-storage-and-minutes
-          - os: macos
-            bazel-version:
-              major: 6
-          - os: windows
-            bazel-version:
-              major: 6
           # Root repository no longer tests non-bzlmod/WORKSPACE
           - folder: .
             bzlmod: 0
@@ -89,14 +49,6 @@ jobs:
           # rules_js v3 is bzlmod-only and requires bazel 7+
           - folder: e2e/smoke_rjs3
             bzlmod: 0
-          - folder: e2e/smoke_rjs3
-            bazel-version:
-              major: 6
-          # bazel 7 linux tested on Aspect Workflows
-          - os: ubuntu
-            bazel-version:
-              major: 7
-            bzlmod: 1
 
     steps:
       - uses: actions/checkout@v4
@@ -108,29 +60,22 @@ jobs:
             ~/.cache/bazel-disk-cache
             ~/.cache/bazel-repository-cache
             ~/.cache/xdg-cache
-          key: bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-${{ hashFiles('.bazelrc', '.bazelversion', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel') }}
-          restore-keys: bazel-cache-${{ matrix.bazel-version.version }}-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
-
-      - name: Configure Bazel version
-        working-directory: ${{ matrix.folder }}
-        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
+          key: bazel-cache-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-${{ hashFiles('.bazelrc', '.bazelversion', '**/BUILD', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE', 'WORKSPACE.bazel', 'WORKSPACE.bzlmod', 'MODULE.bazel') }}
+          restore-keys: bazel-cache-${{ matrix.bzlmod }}-${{ matrix.os }}-${{ matrix.folder }}-
 
       - name: bazel test //...
         working-directory: ${{ matrix.folder }}
         shell: bash
         run: |
+          v=$(head -n 1 .bazelversion)
+          m=${v::1}
           bazel \
-            --bazelrc=${GITHUB_WORKSPACE//\\/\/}/.github/workflows/bazel${{ matrix.bazel-version.major }}.bazelrc \
             --bazelrc=${GITHUB_WORKSPACE//\\/\/}/tools/preset.bazelrc \
             --bazelrc=${GITHUB_WORKSPACE//\\/\/}/.github/workflows/ci.bazelrc \
             test \
-            --test_tag_filters=-skip-on-bazel${{ matrix.bazel-version.major }} \
-            --build_tag_filters=-skip-on-bazel${{ matrix.bazel-version.major }} \
+            --config=ci \
+            --test_tag_filters=-skip-on-bazel${m} \
+            --build_tag_filters=-skip-on-bazel${m} \
             --enable_bzlmod=${{ matrix.bzlmod }} \
             //...
 

.github/workflows/ci.bazelrc

@@ -1,21 +1,8 @@
-load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
 load("@buildifier_prebuilt//:rules.bzl", "buildifier")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages(name = "node_modules")
 
-gazelle_binary(
-    name = "gazelle_bin",
-    languages = ["@bazel_skylib_gazelle_plugin//bzl"],
-)
-
-# gazelle:exclude @bazel/*
-
-gazelle(
-    name = "gazelle",
-    gazelle = "gazelle_bin",
-)
-
 buildifier(
     name = "buildifier",
     exclude_patterns = ["./.git/*"],

.github/workflows/ci.yaml

@@ -7,9 +7,9 @@ module(
 )
 
 # Lower-bounds (minimum) versions for direct runtime dependencies
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
+bazel_dep(name = "aspect_bazel_lib", version = "2.19.2")
 bazel_dep(name = "aspect_rules_js", version = "2.0.0")
-bazel_dep(name = "aspect_tools_telemetry", version = "0.2.8")
+bazel_dep(name = "aspect_tools_telemetry", version = "0.3.3")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 
 tel = use_extension("@aspect_tools_telemetry//:extension.bzl", "telemetry")
@@ -18,27 +18,10 @@ use_repo(tel, "aspect_tools_telemetry_report")
 ####### Dev dependencies ########
 
 bazel_dep(name = "bazel_features", version = "0.1.0", dev_dependency = True)
-bazel_dep(name = "bazelrc-preset.bzl", version = "1.5.1", dev_dependency = True)
-bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
-bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
-bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle")
+bazel_dep(name = "bazelrc-preset.bzl", version = "1.9.2", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.2", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.8", dev_dependency = True)
 
-buildifier_prebuilt = use_extension(
-    "@buildifier_prebuilt//:defs.bzl",
-    "buildifier_prebuilt_deps_extension",
-    dev_dependency = True,
-)
-use_repo(
-    buildifier_prebuilt,
-    "buildifier_prebuilt_toolchains",
-)
-
-register_toolchains(
-    "@buildifier_prebuilt_toolchains//:all",
-    dev_dependency = True,
-)
-
 # NPM packages for testing
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
 npm.npm_translate_lock(