Fix `@rules_java` CI Broken by yesterday's buildifier release: https://github.com/bazel-contrib/buildtools/releases/tag/v10.0.1 (containing https://github.com/bazel-contrib/buildtools/pull/1484) Also update the ubuntu platform as `ubuntu2004` is EOL, see https://github.com/bazelbuild/continuous-integration/pull/2846/changes#diff-a60e9d3d5a335fd36f73da65e8e6a0ad08ef40573831fd96068518b603db6106R339 (ignore-relnotes) PiperOrigin-RevId: 982389191 Change-Id: I97afda62b5ab1f53891bf2d3b5c23efd88c34a5c
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 5d3d2f4..e9d03fa 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml
@@ -26,7 +26,7 @@ buildifier: latest matrix: - all_platforms: ["rockylinux8_arm64", "ubuntu2004", "macos", "macos_arm64", "windows"] + all_platforms: ["rockylinux8_arm64", "ubuntu2404", "macos", "macos_arm64", "windows"] bazel: ["7.x", "8.x", "9.x", "last_green"] modern_bazel: ["9.x", "last_green", "rolling"] # Fully supported Bazel versions @@ -85,7 +85,7 @@ # internal tests for configs and release process internal_tests: name: "Internal tests" - platform: "ubuntu2004" + platform: "ubuntu2404" shell_commands: - "git init" - "git config user.name 'fake-user-for-testing'"
diff --git a/test/BUILD.bazel b/test/BUILD.bazel index 9d133ce..9469fb9 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel
@@ -54,7 +54,7 @@ name = "check_release_notes_test", srcs = ["check_release_notes_test.sh"], args = [ - "$(location //distro:relnotes.txt)", + "$(rootpath //distro:relnotes.txt)", module_version(), ], data = ["//distro:relnotes.txt"],
diff --git a/test/java/toolchains/java_toolchain_tests.bzl b/test/java/toolchains/java_toolchain_tests.bzl index 793de8e..099b5e4 100644 --- a/test/java/toolchains/java_toolchain_tests.bzl +++ b/test/java/toolchains/java_toolchain_tests.bzl
@@ -296,7 +296,7 @@ analysis_test( name = name, - impl = _test_no_header_compiler_header_compilation_disabled_analyzes_successfully_impl, + impl = lambda unused_env, unused_target: None, # Implicitly succeeds. target = name + "/a", config_settings = { "//command_line_option:extra_toolchains": [Label(name + "/toolchain")], @@ -304,12 +304,6 @@ }, ) -def _test_no_header_compiler_header_compilation_disabled_analyzes_successfully_impl( - env, # @unused - target): # @unused - # Implicitly succeeds. - pass - def _test_header_compiler_builtin_processors(name): util.helper_target( mock_java_toolchain,