ci: test bazel 8.4.2 and 7.6.2, and build with 8.4.2 by default (#854)

Co-authored-by: Sahin Yort <[email protected]>

Author: mostynb

.bazelrc

@@ -6,11 +6,8 @@ build --incompatible_strict_action_env
 build --nolegacy_external_runfiles
 common --test_env=DOCKER_HOST --action_env=DOCKER_HOST --repo_env=DOCKER_HOST
 
-# On bazel 6.4.0 these are needed to successfully fetch images.
-common:needs_credential_helpers --credential_helper=public.ecr.aws=%workspace%/examples/credential_helper/auth.sh
-common:needs_credential_helpers --credential_helper=index.docker.io=%workspace%/examples/credential_helper/auth.sh
-common:needs_credential_helpers --credential_helper=docker.elastic.co=%workspace%/examples/credential_helper/auth.sh
-common:needs_credential_helpers --credential_helper_cache_duration=0
+# Keep WORKSPACE support until we stop supporting bazel 7?
+common --enable_workspace
 
 # Don’t want to push a rules author to update their deps if not needed.
 # https://bazel.build/reference/command-line-reference#flag--check_direct_dependencies

.bazelversion

@@ -1,4 +1,4 @@
-7.4.1
+8.4.2
 
 # 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.

.github/workflows/ci.yaml

@@ -23,12 +23,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - id: bazel_7
+      - id: bazel_8
         run: echo "bazelversion=$(head -n 1 .bazelversion)" >> $GITHUB_OUTPUT
-      - id: bazel_6
-        run: echo "bazelversion=6.4.0" >> $GITHUB_OUTPUT
+      - id: bazel_7
+        run: echo "bazelversion=7.6.2" >> $GITHUB_OUTPUT
     outputs:
-      # Will look like ["<version from .bazelversion>", "6.4.0"]
+      # Will look like ["<version from .bazelversion>", "7.6.2"]
       bazelversions: ${{ toJSON(steps.*.outputs.bazelversion) }}
 
   matrix-prep-os:
@@ -74,13 +74,13 @@ jobs:
           - os: macos-13
             folder: e2e/assertion
           - os: macos-13
-            bazelversion: 6.4.0
+            bazelversion: 7.6.2
           - folder: .
-            bazelversion: 6.4.0
+            bazelversion: 7.6.2
           - folder: examples/dockerfile
             bzlmodEnabled: false
           - folder: examples/dockerfile
-            bazelversion: 6.4.0
+            bazelversion: 7.6.2
           # e2e/assertion is bzlmod only but it has test for both cases.
           - folder: e2e/assertion
             bzlmodEnabled: false
@@ -91,7 +91,7 @@ jobs:
           - folder: .
             bzlmodEnabled: false
           # This is tested on Buildkite using Aspect Workflows
-          - bazelversion: 7.4.1
+          - bazelversion: 7.6.2
             folder: .
             os: ubuntu-latest
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -121,12 +121,12 @@ jobs:
         # Add --config needs_credential_helpers to add additional credential helpers
         # to fetch from registries with HTTP headers set by credential helpers.
         id: set_credential_helper_flag
-        if: matrix.bazelversion == '6.4.0' && matrix.folder == '.'
+        if: matrix.bazelversion == '7.6.2' && matrix.folder == '.'
         run: echo "credential_helper_flag=--config=needs_credential_helpers" >> $GITHUB_OUTPUT
 
       - name: Setup crane for credential helpers to use
         uses: imjasonh/[email protected]
-        if: matrix.bazelversion == '6.4.0' && matrix.folder == '.'
+        if: matrix.bazelversion == '7.6.2' && matrix.folder == '.'
         with:
           version: "v0.19.1"
 

MODULE.bazel

@@ -7,8 +7,8 @@ module(
 
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.2")
 bazel_dep(name = "bazel_features", version = "1.10.0")
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "platforms", version = "1.0.0")
 
 oci = use_extension("//oci:extensions.bzl", "oci")
 oci.toolchains()

docs/image.md

@@ -35,7 +35,6 @@ load("@aspect_bazel_lib//lib:bats.bzl", "bats_test")
     )
     for (name, flags) in [
         ("bzlmod", "--enable_bzlmod"),
-        ("nobzlmod", "--noenable_bzlmod"),
     ]
 ]
 
@@ -65,7 +64,6 @@ load("@aspect_bazel_lib//lib:bats.bzl", "bats_test")
     )
     for (name, flags) in [
         ("bzlmod", "--enable_bzlmod"),
-        ("nobzlmod", "--noenable_bzlmod"),
     ]
 ]
 
@@ -95,8 +93,6 @@ load("@aspect_bazel_lib//lib:bats.bzl", "bats_test")
     )
     for (name, flags) in [
         ("bzlmod_legacy_runfiles", "--enable_bzlmod --legacy_external_runfiles"),
-        ("nobzlmod_legacy_runfiles", "--noenable_bzlmod --legacy_external_runfiles"),
         ("bzlmod_nolegacy_runfiles", "--enable_bzlmod --nolegacy_external_runfiles"),
-        ("nobzlmod_nolegacy_runfiles", "--noenable_bzlmod --nolegacy_external_runfiles"),
     ]
 ]