From 34f9787afe9760d85917eba4b4fc3e7934c8fd8f Mon Sep 17 00:00:00 2001 From: Ilya Polyakovskiy Date: Fri, 8 Jul 2022 15:04:10 +0200 Subject: [PATCH 1/4] test all bazel versions from 4.0.0 to 4.2.2 according to haskell/private/versions.bzl --- bazel_versions.bzl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bazel_versions.bzl b/bazel_versions.bzl index 4b6ee2a73..fba59abb7 100644 --- a/bazel_versions.bzl +++ b/bazel_versions.bzl @@ -1,5 +1,9 @@ SUPPORTED_BAZEL_VERSIONS = [ + "4.0.0", "4.1.0", + "4.2.0", + "4.2.1", + "4.2.2", ] SUPPORTED_NIXPKGS_BAZEL_PACKAGES = [ From 47307e57ec8f4113dc2d7db681770f2d5e5d0fdb Mon Sep 17 00:00:00 2001 From: Ilya Polyakovskiy Date: Fri, 8 Jul 2022 16:20:10 +0200 Subject: [PATCH 2/4] Leave only lower and upper bazel versions in major release for testing, use this values as a min and max bazel versions in haskell/private/versions.bzl --- bazel_versions.bzl | 3 --- haskell/private/versions.bzl | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bazel_versions.bzl b/bazel_versions.bzl index fba59abb7..4694dc001 100644 --- a/bazel_versions.bzl +++ b/bazel_versions.bzl @@ -1,8 +1,5 @@ SUPPORTED_BAZEL_VERSIONS = [ "4.0.0", - "4.1.0", - "4.2.0", - "4.2.1", "4.2.2", ] diff --git a/haskell/private/versions.bzl b/haskell/private/versions.bzl index 689d7fe25..4665072fd 100644 --- a/haskell/private/versions.bzl +++ b/haskell/private/versions.bzl @@ -10,6 +10,8 @@ # in this file executes (and there's no way to execute it later; see first # paragraph above). +load("//:bazel_versions.bzl", "SUPPORTED_BAZEL_VERSIONS") + def _parse_version_chunk(version_chunk): """ Args: @@ -112,8 +114,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) From 433e3b6864685fe4cd674a50440216bd4f9dd3ce Mon Sep 17 00:00:00 2001 From: Ilya Polyakovskiy Date: Mon, 11 Jul 2022 15:17:08 +0200 Subject: [PATCH 3/4] move supported bazel versions in haskell/private/versions.bzl --- haskell/private/versions.bzl | 9 ++++++++- .../rules_haskell_integration_test.bzl | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/haskell/private/versions.bzl b/haskell/private/versions.bzl index 4665072fd..628753bfd 100644 --- a/haskell/private/versions.bzl +++ b/haskell/private/versions.bzl @@ -10,7 +10,14 @@ # in this file executes (and there's no way to execute it later; see first # paragraph above). -load("//:bazel_versions.bzl", "SUPPORTED_BAZEL_VERSIONS") +SUPPORTED_BAZEL_VERSIONS = [ + "4.0.0", + "4.2.2", +] + +SUPPORTED_NIXPKGS_BAZEL_PACKAGES = [ + "bazel_4", +] def _parse_version_chunk(version_chunk): """ 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", ) From 36b23a4c2bae258c1dd1c8488292c910bfbcc7f8 Mon Sep 17 00:00:00 2001 From: Ilya Polyakovskiy Date: Tue, 12 Jul 2022 11:45:48 +0200 Subject: [PATCH 4/4] remove bazel_versions.bzl --- bazel_versions.bzl | 8 -------- tests/integration_testing/dependencies.bzl | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 bazel_versions.bzl diff --git a/bazel_versions.bzl b/bazel_versions.bzl deleted file mode 100644 index 4694dc001..000000000 --- a/bazel_versions.bzl +++ /dev/null @@ -1,8 +0,0 @@ -SUPPORTED_BAZEL_VERSIONS = [ - "4.0.0", - "4.2.2", -] - -SUPPORTED_NIXPKGS_BAZEL_PACKAGES = [ - "bazel_4", -] 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", )