Switch to bazel_binaries.versions.

bazel-contrib · Mar 16, 2023 · 0f204c0 · 0f204c0
1 parent cab6203
commit 0f204c0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/bazel_integration_test/bzlmod/BUILD.bazel b/bazel_integration_test/bzlmod/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@bazel_binaries//:defs.bzl", "bazel_binaries")
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
-load("//:bazel_versions.bzl", "CURRENT_BAZEL_VERSION")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
@@ -28,7 +27,7 @@ sh_binary(
 bazel_integration_test(
     name = "e2e_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     # Override the default tags. Let this run with bazel test //...
     tags = [],
     test_runner = ":e2e_test_runner",

diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@bazel_binaries//:defs.bzl", "bazel_binaries")
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
-load("//:bazel_versions.bzl", "CURRENT_BAZEL_VERSION", "OTHER_BAZEL_VERSIONS")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
@@ -22,7 +21,7 @@ default_test_runner(
 bazel_integration_test(
     name = "simple_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     test_runner = ":simple_test_runner",
     workspace_files = integration_test_utils.glob_workspace_files("simple") + [
         "//:shared_bazelrc_files",
@@ -37,7 +36,7 @@ bazel_integration_tests(
     # buildifier: disable=duplicated-name
     name = "simple_test",
     bazel_binaries = bazel_binaries,
-    bazel_versions = OTHER_BAZEL_VERSIONS,
+    bazel_versions = bazel_binaries.versions.other,
     test_runner = ":simple_test_runner",
     workspace_files = integration_test_utils.glob_workspace_files("simple") + [
         "//:shared_bazelrc_files",
@@ -61,7 +60,7 @@ default_test_runner(
 bazel_integration_test(
     name = "custom_test_runner_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     # GH120: Enable the custom_test_runner test once swift_bazel supports
     # bzlmod.
     target_compatible_with = select({
@@ -93,7 +92,7 @@ sh_binary(
 bazel_integration_test(
     name = "use_create_scratch_dir_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     test_runner = ":use_create_scratch_dir_test_runner",
     workspace_files = integration_test_utils.glob_workspace_files("simple") + [
         "//:local_repository_files",
@@ -116,7 +115,7 @@ sh_binary(
 bazel_integration_test(
     name = "dynamic_workspace_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     test_runner = ":dynamic_workspace_test_runner",
 )
 
@@ -139,7 +138,7 @@ test_suite(
         ":dynamic_workspace_test",
     ] + integration_test_utils.bazel_integration_test_names(
         "simple_test",
-        OTHER_BAZEL_VERSIONS,
+        bazel_binaries.versions.other,
     ),
     visibility = ["//:__subpackages__"],
 )
diff --git a/release/BUILD.bazel b/release/BUILD.bazel
@@ -10,7 +10,6 @@ load(
     "release_archive",
     "update_readme",
 )
-load("//:bazel_versions.bzl", "CURRENT_BAZEL_VERSION")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
@@ -76,6 +75,6 @@ sh_binary(
 bazel_integration_test(
     name = "archive_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     test_runner = ":archive_test_runner",
 )
diff --git a/tests/params_tests/BUILD.bazel b/tests/params_tests/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@bazel_binaries//:defs.bzl", "bazel_binaries")
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
-load("//:bazel_versions.bzl", "CURRENT_BAZEL_VERSION")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
@@ -20,7 +19,7 @@ default_test_runner(
 bazel_integration_test(
     name = "default_env_inherit_int_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     test_runner = ":test_runner",
     workspace_path = "workspace",
 )
@@ -39,7 +38,7 @@ env_inherit_attr_test(
 bazel_integration_test(
     name = "override_env_inherit_int_test",
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     env_inherit = [
         "HOME",
         "SUDO_ASKPASS",
@@ -68,7 +67,7 @@ bazel_integration_test(
         "CHICKEN",
     ],
     bazel_binaries = bazel_binaries,
-    bazel_version = CURRENT_BAZEL_VERSION,
+    bazel_version = bazel_binaries.versions.current,
     test_runner = ":test_runner",
     workspace_path = "workspace",
 )

diff --git a/tests/py_tests/BUILD.bazel b/tests/py_tests/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@bazel_binaries//:defs.bzl", "bazel_binaries")
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
-load("//:bazel_versions.bzl", "SUPPORTED_BAZEL_VERSIONS")
 load("//bazel_integration_test:defs.bzl", "integration_test_utils")
 load("//bazel_integration_test/py:bazel_py_integration_tests.bzl", "bazel_py_integration_tests")
 
@@ -10,7 +9,7 @@ bazel_py_integration_tests(
     name = "test_base_test",
     srcs = ["test_base_test.py"],
     bazel_binaries = bazel_binaries,
-    bazel_versions = SUPPORTED_BAZEL_VERSIONS,
+    bazel_versions = bazel_binaries.versions.all,
 )
 
 # MARK: - Test Suite
@@ -22,7 +21,7 @@ test_suite(
     tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS,
     tests = integration_test_utils.bazel_integration_test_names(
         "test_base_test",
-        SUPPORTED_BAZEL_VERSIONS,
+        bazel_binaries.versions.all,
     ),
     visibility = ["//:__subpackages__"],
 )