From e24339ea07be4e450f7fba77660adf123560497e Mon Sep 17 00:00:00 2001 From: Ignas Anikevicius Date: Mon, 2 Jan 2023 15:45:45 +0900 Subject: [PATCH] Fully switch to bazel 6.0.0 in all places --- examples/BUILD.bazel | 2 +- examples/bzlmod/.bazelversion | 2 +- internal_setup.bzl | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index 4f99e2b819..e0a7e5a72d 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -51,5 +51,5 @@ bazel_integration_test( bazel_integration_test( name = "bzlmod_example", bzlmod = True, - override_bazel_version = "6.0.0rc1", + override_bazel_version = "6.0.0", ) diff --git a/examples/bzlmod/.bazelversion b/examples/bzlmod/.bazelversion index 6b4ab2c84d..09b254e90c 100644 --- a/examples/bzlmod/.bazelversion +++ b/examples/bzlmod/.bazelversion @@ -1 +1 @@ -6.0.0rc1 \ No newline at end of file +6.0.0 diff --git a/internal_setup.bzl b/internal_setup.bzl index beb26e8a81..f4d3a1a8db 100644 --- a/internal_setup.bzl +++ b/internal_setup.bzl @@ -31,13 +31,6 @@ def rules_python_internal_setup(): # Depend on the Bazel binaries for running bazel-in-bazel tests bazel_binaries(versions = SUPPORTED_BAZEL_VERSIONS) - # Bazel 5.3.0 has bzlmod bugs so we use 6.0 prerelease for the bzlmod example. - # SUPPORTED_BAZEL_VERSIONS doesn't currently support multiple versions. For now, - # we only want to run the bzlmod example with a separate version. - bazel_binaries(versions = [ - "6.0.0rc1", - ]) - bazel_skylib_workspace() # gazelle:repository_macro gazelle/deps.bzl%gazelle_deps