From 2e11aba10165bbafa0b7d616fc56a97231ffd300 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 3 Jan 2024 09:04:36 +0100 Subject: [PATCH 1/2] Upgrade rules_sh to 0.4.0 --- MODULE.bazel | 2 +- haskell/repositories.bzl | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2993d7f42..283e0a7cf 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -46,7 +46,7 @@ bazel_dep( ) bazel_dep( name = "rules_sh", - version = "0.3.0", + version = "0.4.0", ) ghc_version = use_extension("//extensions:ghc_version.bzl", "ghc_default_version") diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index 91d1a2ca3..231bd7cbf 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -11,8 +11,8 @@ load(":private/ghc_ci.bzl", "ghc_default_version") _rules_nixpkgs_version = "0.10.0" _rules_nixpkgs_sha256 = "980edfceef2e59e1122d9be6c52413bc298435f0a3d452532b8a48d7562ffd67" -_rules_sh_version = "v0.3.0" -_rules_sh_sha256 = "d668bb32f112ead69c58bde2cae62f6b8acefe759a8c95a2d80ff6a85af5ac5e" +_rules_sh_version = "v0.4.0" +_rules_sh_sha256 = "3243af3fcb3768633fd39f3654de773e5fb61471a2fae5762a1653c22c412d2c" def rules_haskell_dependencies_bzlmod(): """Provide rules_haskell dependencies which are not available as bzlmod modules.""" @@ -66,7 +66,12 @@ def rules_haskell_dependencies(): maybe( http_archive, name = "rules_sh", - urls = ["https://github.com/tweag/rules_sh/archive/%s.tar.gz" % _rules_sh_version], + urls = [ + "https://github.com/tweag/rules_sh/releases/download/{TAG}/rules_sh-{VERSION}.tar.gz".format( + TAG = _rules_sh_version, + VERSION = _rules_sh_version.lstrip("v"), + ), + ], sha256 = _rules_sh_sha256, strip_prefix = "rules_sh-%s" % _rules_sh_version.lstrip("v"), ) From 5f0ebc0ca4d1ae0923c8e4243b9b5849290efe46 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 3 Jan 2024 13:40:13 +0100 Subject: [PATCH 2/2] Upgrade rules_sh to 0.4.0 in test module --- rules_haskell_tests/MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel index ca9cc2bca..009099fc4 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -53,7 +53,7 @@ bazel_dep( ) bazel_dep( name = "rules_sh", - version = "0.3.0", + version = "0.4.0", ) bazel_dep( name = "bazel_skylib",