Fix CI for Bazel 9 (#310)
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 811283f..53d90cf 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml
@@ -47,9 +47,7 @@ test_targets: # Non-manual tests + manual tests requiring stable Bazel - "//..." - - "//test:repo_rules_bazel_8_test" - - "//test:symbolic_macro_inherit_attrs_bazel_8_test" - - "//test:table_of_contents_bazel_8_test" + - "//test:symbolic_macro_inherit_attrs_test" skip_in_bazel_downstream_pipeline: "Includes manual golden tests requiring stable Bazel" build_and_test_windows: @@ -64,12 +62,6 @@ - "//test:table_of_contents_bazel_8_test" skip_in_bazel_downstream_pipeline: "Includes manual golden tests requiring stable Bazel" - noenable_bzlmod: - <<: *noenable_bzlmod_task_config - name: Build and test - legacy WORKSPACE setup - platform: ubuntu2004 - skip_in_bazel_downstream_pipeline: "Bazel@HEAD no longer supports WORKSPACE" - build_and_test_last_green: <<: *common_task_config name: Build and test - Bazel last green @@ -78,9 +70,6 @@ test_targets: # Non-manual tests + manual tests requiring Bazel at HEAD - "//..." - - "//test:repo_rules_test" - - "//test:symbolic_macro_inherit_attrs_test" - - "//test:table_of_contents_test" build_and_test_last_green_windows: <<: *windows_task_config @@ -90,9 +79,6 @@ test_targets: # Non-manual tests + manual tests requiring Bazel at HEAD - "//..." - - "//test:repo_rules_test" - - "//test:symbolic_macro_inherit_attrs_test" - - "//test:table_of_contents_test" bzlmod_usage: <<: *common_task_config @@ -106,10 +92,27 @@ platform: windows working_directory: test/bzlmod + bazel_8_tests: + name: Stardoc golden tests requiring Bazel 8 + platform: ubuntu2004 + bazel: 8.5.1 + test_targets: + - "//test:repo_rules_bazel_8_test" + - "//test:symbolic_macro_inherit_attrs_bazel_8_test" + - "//test:table_of_contents_bazel_8_test" + skip_in_bazel_downstream_pipeline: Manual tests requiring an older Bazel version + + bazel_8_noenable_bzlmod: + <<: *noenable_bzlmod_task_config + name: Build and test - legacy WORKSPACE setup + platform: ubuntu2004 + bazel: 8.5.1 + skip_in_bazel_downstream_pipeline: WORKSPACE tests requiring an older Bazel version + bazel_7_tests: name: Stardoc golden tests requiring Bazel 7 platform: ubuntu2004 - bazel: 7.6.1 + bazel: 7.7.1 test_targets: - "//test:proto_format_test" - "//test:macro_kwargs_legacy_test"
diff --git a/test/BUILD b/test/BUILD index f205c6b..847d810 100644 --- a/test/BUILD +++ b/test/BUILD
@@ -58,10 +58,6 @@ name = "repo_rules_test", golden_file = "testdata/repo_rules_test/golden.md", input_file = "testdata/repo_rules_test/input.bzl", - tags = [ - "bazel_9", - "manual", - ], ) stardoc_test( @@ -309,10 +305,6 @@ golden_file = "testdata/table_of_contents_test/golden.md", input_file = "testdata/table_of_contents_test/input.bzl", table_of_contents_template = "//stardoc:templates/markdown_tables/table_of_contents.vm", - tags = [ - "bazel_9", - "manual", - ], deps = [":table_of_contents_test_deps"], )
diff --git a/update-stardoc-tests.sh b/update-stardoc-tests.sh index 67e31e4..b39e092 100755 --- a/update-stardoc-tests.sh +++ b/update-stardoc-tests.sh
@@ -60,11 +60,10 @@ : "${BAZEL:=bazelisk}" update_non_manual_tests -update_manual_tests_with_tag "noenable_bzlmod" --noenable_bzlmod --enable_workspace -USE_BAZEL_VERSION="7.6.1" update_manual_tests_with_tag "bazel_7" -USE_BAZEL_VERSION="8.4.1" update_manual_tests_with_tag "bazel_8" -# last_green on 2025-09-30 -USE_BAZEL_VERSION="198c4c8aae1b5ef3d202f602932a99ce19707fc4" update_manual_tests_with_tag "bazel_9" +USE_BAZEL_VERSION="9.0.0" update_manual_tests_with_tag "bazel_9" +USE_BAZEL_VERSION="8.5.1" update_manual_tests_with_tag "bazel_8" +USE_BAZEL_VERSION="8.5.1" update_manual_tests_with_tag "noenable_bzlmod" --noenable_bzlmod --enable_workspace +USE_BAZEL_VERSION="7.7.1" update_manual_tests_with_tag "bazel_7" echo "** Files copied." echo "Please note that not all golden files are correctly copied by this script."