diff --git a/bazel_versions.bzl b/bazel_versions.bzl deleted file mode 100644 index 4b6ee2a73..000000000 --- a/bazel_versions.bzl +++ /dev/null @@ -1,7 +0,0 @@ -SUPPORTED_BAZEL_VERSIONS = [ - "4.1.0", -] - -SUPPORTED_NIXPKGS_BAZEL_PACKAGES = [ - "bazel_4", -] diff --git a/haskell/private/versions.bzl b/haskell/private/versions.bzl index 689d7fe25..628753bfd 100644 --- a/haskell/private/versions.bzl +++ b/haskell/private/versions.bzl @@ -10,6 +10,15 @@ # in this file executes (and there's no way to execute it later; see first # paragraph above). +SUPPORTED_BAZEL_VERSIONS = [ + "4.0.0", + "4.2.2", +] + +SUPPORTED_NIXPKGS_BAZEL_PACKAGES = [ + "bazel_4", +] + def _parse_version_chunk(version_chunk): """ Args: @@ -112,8 +121,8 @@ def check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, baz return (True, "") def check_bazel_version_compatible(actual_version): - min_bazel = "4.0.0" # Change THIS LINE when changing bazel min version - max_bazel = "4.2.2" # Change THIS LINE when changing bazel max version + min_bazel = SUPPORTED_BAZEL_VERSIONS[0] + max_bazel = SUPPORTED_BAZEL_VERSIONS[-1] (compatible, msg) = check_bazel_version(min_bazel, max_bazel, actual_version) diff --git a/tests/integration_testing/dependencies.bzl b/tests/integration_testing/dependencies.bzl index 80015854b..9bd779f9d 100644 --- a/tests/integration_testing/dependencies.bzl +++ b/tests/integration_testing/dependencies.bzl @@ -1,7 +1,7 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_package") load("@contrib_rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_binaries") load( - "//:bazel_versions.bzl", + "//haskell:private/versions.bzl", "SUPPORTED_BAZEL_VERSIONS", "SUPPORTED_NIXPKGS_BAZEL_PACKAGES", ) diff --git a/tests/integration_testing/rules_haskell_integration_test.bzl b/tests/integration_testing/rules_haskell_integration_test.bzl index 840943b3c..64e688627 100644 --- a/tests/integration_testing/rules_haskell_integration_test.bzl +++ b/tests/integration_testing/rules_haskell_integration_test.bzl @@ -4,7 +4,7 @@ load( "integration_test_utils", ) load( - "//:bazel_versions.bzl", + "//haskell:private/versions.bzl", "SUPPORTED_BAZEL_VERSIONS", "SUPPORTED_NIXPKGS_BAZEL_PACKAGES", )