From c76f769bef0d7c12920a921ab4581abd1dfcabca Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Sat, 26 Jul 2025 11:30:02 -0600 Subject: [PATCH 1/3] Fix Gazelle version mismatch. --- MODULE.bazel | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d13e3c9..e3ddfec 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -9,7 +9,7 @@ bazel_dep(name = "rules_shell", version = "0.3.0") bazel_dep(name = "cgrindel_bazel_starlib", version = "0.27.0") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_go", version = "0.50.1") -bazel_dep(name = "gazelle", version = "0.43.0") +bazel_dep(name = "gazelle", version = "0.44.0") go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") go_sdk.download(version = "1.23.3") @@ -51,15 +51,11 @@ bazel_binaries = use_extension( dev_dependency = True, ) bazel_binaries.download(version_file = "//:.bazelversion") - -# GH0086: Enable once Bazel HEAD is happy again. -# bazel_binaries.download(version = "last_green") +bazel_binaries.download(version = "last_green") use_repo( bazel_binaries, "bazel_binaries", "bazel_binaries_bazelisk", "build_bazel_bazel_.bazelversion", - - # GH0086: Enable once Bazel HEAD is happy again. - # "build_bazel_bazel_last_green", + "build_bazel_bazel_last_green", ) From 02328940b7f25a42ba3e5e9671f06b167de0a56b Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Sat, 26 Jul 2025 11:30:13 -0600 Subject: [PATCH 2/3] Regenerate CI. --- .github/workflows/ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98f3ea5..4b914bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,18 +39,34 @@ jobs: runner: ubuntu-22.04 - test: '@@//examples:custom_swift_proto_compiler_test_bazel_.bazelversion' runner: macos-15 + - test: '@@//examples:custom_swift_proto_compiler_test_bazel_last_green' + runner: ubuntu-22.04 + - test: '@@//examples:custom_swift_proto_compiler_test_bazel_last_green' + runner: macos-15 - test: '@@//examples:grpc_example_test_bazel_.bazelversion' runner: ubuntu-22.04 - test: '@@//examples:grpc_example_test_bazel_.bazelversion' runner: macos-15 + - test: '@@//examples:grpc_example_test_bazel_last_green' + runner: ubuntu-22.04 + - test: '@@//examples:grpc_example_test_bazel_last_green' + runner: macos-15 - test: '@@//examples:grpc_package_example_test_bazel_.bazelversion' runner: ubuntu-22.04 - test: '@@//examples:grpc_package_example_test_bazel_.bazelversion' runner: macos-15 + - test: '@@//examples:grpc_package_example_test_bazel_last_green' + runner: ubuntu-22.04 + - test: '@@//examples:grpc_package_example_test_bazel_last_green' + runner: macos-15 - test: '@@//examples:simple_test_bazel_.bazelversion' runner: ubuntu-22.04 - test: '@@//examples:simple_test_bazel_.bazelversion' runner: macos-15 + - test: '@@//examples:simple_test_bazel_last_green' + runner: ubuntu-22.04 + - test: '@@//examples:simple_test_bazel_last_green' + runner: macos-15 - test: '@@//release:archive_test' runner: ubuntu-22.04 - test: '@@//release:archive_test' From aedee7992d8ad95d14c7ca4506af4abfee3dd359 Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Sat, 26 Jul 2025 12:06:13 -0600 Subject: [PATCH 3/3] Use recent aspect_bazel_lib to support last_green tests. --- examples/custom_swift_proto_compiler/MODULE.bazel | 5 +++++ examples/grpc_example/MODULE.bazel | 5 +++++ examples/grpc_package_example/MODULE.bazel | 5 +++++ examples/simple/MODULE.bazel | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/examples/custom_swift_proto_compiler/MODULE.bazel b/examples/custom_swift_proto_compiler/MODULE.bazel index 7171135..b4243a7 100644 --- a/examples/custom_swift_proto_compiler/MODULE.bazel +++ b/examples/custom_swift_proto_compiler/MODULE.bazel @@ -16,6 +16,11 @@ bazel_dep(name = "cgrindel_bazel_starlib", version = "0.27.0") bazel_dep(name = "bazel_skylib", version = "1.8.1") bazel_dep(name = "rules_shell", version = "0.5.0") +# The aspect_bazel_lib dependency is not directly used by this workspace. +# However, it is used transitively. We need a recent version to support the +# Bazel last_green tests. +bazel_dep(name = "aspect_bazel_lib", version = "2.20.0") + # The apple_support bazel_dep must come before the rules_cc. # https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution bazel_dep(name = "apple_support", version = "1.22.1") diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 467c150..8092f68 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -15,6 +15,11 @@ bazel_dep(name = "rules_swift_package_manager", version = "1.3.0") bazel_dep(name = "cgrindel_bazel_starlib", version = "0.27.0") bazel_dep(name = "bazel_skylib", version = "1.8.1") +# The aspect_bazel_lib dependency is not directly used by this workspace. +# However, it is used transitively. We need a recent version to support the +# Bazel last_green tests. +bazel_dep(name = "aspect_bazel_lib", version = "2.20.0") + # The apple_support bazel_dep must come before the rules_cc. # https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution bazel_dep(name = "apple_support", version = "1.22.1") diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 9db230e..5018d1f 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -15,6 +15,11 @@ bazel_dep(name = "rules_swift_package_manager", version = "1.3.0") bazel_dep(name = "cgrindel_bazel_starlib", version = "0.27.0") bazel_dep(name = "bazel_skylib", version = "1.8.1") +# The aspect_bazel_lib dependency is not directly used by this workspace. +# However, it is used transitively. We need a recent version to support the +# Bazel last_green tests. +bazel_dep(name = "aspect_bazel_lib", version = "2.20.0") + # The apple_support bazel_dep must come before the rules_cc. # https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution bazel_dep(name = "apple_support", version = "1.22.1") diff --git a/examples/simple/MODULE.bazel b/examples/simple/MODULE.bazel index 6817fd4..3389a5e 100644 --- a/examples/simple/MODULE.bazel +++ b/examples/simple/MODULE.bazel @@ -9,6 +9,11 @@ local_path_override( bazel_dep(name = "cgrindel_bazel_starlib", version = "0.27.0") +# The aspect_bazel_lib dependency is not directly used by this workspace. +# However, it is used transitively. We need a recent version to support the +# Bazel last_green tests. +bazel_dep(name = "aspect_bazel_lib", version = "2.20.0") + # The apple_support bazel_dep must come before the rules_cc. # https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution bazel_dep(name = "apple_support", version = "1.22.1")