From 67a4178f3a9b6a620dbd48272b695dcc9e957f67 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 21 Nov 2023 14:42:35 +0000 Subject: [PATCH 1/5] chore(deps): update dependency com_github_bazelbuild_buildtools to v6.4.0 --- non_module_dev_deps.bzl | 6 +++--- rules_haskell_tests/non_module_deps.bzl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl index bca3a5a54..c64ec80eb 100644 --- a/non_module_dev_deps.bzl +++ b/non_module_dev_deps.bzl @@ -66,12 +66,12 @@ def repositories(*, bzlmod): # no modules are provided at the moment for buildifier http_archive( name = "com_github_bazelbuild_buildtools", - sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a", + sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269", # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"], patch_args = ["-p1"], - strip_prefix = "buildtools-6.3.3", - urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.3.tar.gz"], + strip_prefix = "buildtools-6.4.0", + urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"], ) nixpkgs_local_repository( diff --git a/rules_haskell_tests/non_module_deps.bzl b/rules_haskell_tests/non_module_deps.bzl index e8be0c521..7eaa77717 100644 --- a/rules_haskell_tests/non_module_deps.bzl +++ b/rules_haskell_tests/non_module_deps.bzl @@ -65,12 +65,12 @@ def repositories(*, bzlmod): # no modules are provided at the moment for buildifier http_archive( name = "com_github_bazelbuild_buildtools", - sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a", + sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269", # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"], patch_args = ["-p1"], - strip_prefix = "buildtools-6.3.3", - urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.3.tar.gz"], + strip_prefix = "buildtools-6.4.0", + urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"], ) http_archive( From ac09daae4ea4c5ec1b3feb2606b1aa105c3ed205 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 21 Nov 2023 16:07:43 +0100 Subject: [PATCH 2/5] Remove buildifier_test-workspace.patch --- buildifier/buildifier_test-workspace.patch | 37 ---------------------- non_module_dev_deps.bzl | 3 -- rules_haskell_nix/WORKSPACE.bzlmod | 9 ++---- rules_haskell_tests/non_module_deps.bzl | 3 -- 4 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 buildifier/buildifier_test-workspace.patch diff --git a/buildifier/buildifier_test-workspace.patch b/buildifier/buildifier_test-workspace.patch deleted file mode 100644 index df21d48b1..000000000 --- a/buildifier/buildifier_test-workspace.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/buildifier/internal/factory.bzl b/buildifier/internal/factory.bzl -index bc317c6..8e1cc78 100644 ---- a/buildifier/internal/factory.bzl -+++ b/buildifier/internal/factory.bzl -@@ -91,6 +91,7 @@ def buildifier_attr_factory(test_rule = False): - ".sky", - "BUILD", - "WORKSPACE", -+ "WORKSPACE.bzlmod", - ], - doc = "A list of labels representing the starlark files to include in the test", - ), -diff --git a/buildifier/runner.bash.template b/buildifier/runner.bash.template -index 2ddbf3f..cc510fb 100644 ---- a/buildifier/runner.bash.template -+++ b/buildifier/runner.bash.template -@@ -11,7 +11,7 @@ buildifier_short_path=$(readlink "$BUILDIFIER_SHORT_PATH") - if [[ ! -z "${TEST_WORKSPACE+x}" && -z "${BUILD_WORKSPACE_DIRECTORY+x}" ]]; then - FIND_FILE_TYPE="l" - # If WORKSPACE was provided, then the script is being run under a test in no_sandbox mode -- if [[ ! -z "${WORKSPACE+x}" ]]; then -+ if [[ ! -z "${WORKSPACE:+x}" ]]; then - FIND_FILE_TYPE="f" - - # resolve the WORKSPACE symlink -@@ -52,9 +52,11 @@ find . \ - -o -name '*.BUILD' \ - -o -name 'BUILD.*.bazel' \ - -o -name 'BUILD.*.oss' \ -+ -o -name MODULE.bazel \ - -o -name WORKSPACE \ - -o -name WORKSPACE.bazel \ - -o -name WORKSPACE.oss \ -+ -o -name WORKSPACE.bzlmod \ - -o -name 'WORKSPACE.*.bazel' \ - -o -name 'WORKSPACE.*.oss' \ - \) -print | xargs "$buildifier_short_path" "${ARGS[@]}" diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl index c64ec80eb..a7a1ad36d 100644 --- a/non_module_dev_deps.bzl +++ b/non_module_dev_deps.bzl @@ -67,9 +67,6 @@ def repositories(*, bzlmod): http_archive( name = "com_github_bazelbuild_buildtools", sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269", - # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too - patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"], - patch_args = ["-p1"], strip_prefix = "buildtools-6.4.0", urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"], ) diff --git a/rules_haskell_nix/WORKSPACE.bzlmod b/rules_haskell_nix/WORKSPACE.bzlmod index 8dbf72573..68a36f8e9 100644 --- a/rules_haskell_nix/WORKSPACE.bzlmod +++ b/rules_haskell_nix/WORKSPACE.bzlmod @@ -13,12 +13,9 @@ nixpkgs_package( http_archive( name = "com_github_bazelbuild_buildtools", - patch_args = ["-p1"], - # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too - patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"], - sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a", - strip_prefix = "buildtools-6.3.3", + sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269", + strip_prefix = "buildtools-6.4.0", urls = [ - "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.3.3.tar.gz", + "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.4.0.tar.gz", ], ) diff --git a/rules_haskell_tests/non_module_deps.bzl b/rules_haskell_tests/non_module_deps.bzl index 7eaa77717..78696412f 100644 --- a/rules_haskell_tests/non_module_deps.bzl +++ b/rules_haskell_tests/non_module_deps.bzl @@ -66,9 +66,6 @@ def repositories(*, bzlmod): http_archive( name = "com_github_bazelbuild_buildtools", sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269", - # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too - patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"], - patch_args = ["-p1"], strip_prefix = "buildtools-6.4.0", urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"], ) From af49604dc7f4275f109c1d72ba91f9af760275a6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 21 Nov 2023 14:42:27 +0000 Subject: [PATCH 3/5] chore(deps): update dependency aspect_bazel_lib to v1.38.1 --- rules_haskell_tests/MODULE.bazel | 2 +- rules_haskell_tests/WORKSPACE | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel index 520749777..d9a7512ac 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -73,7 +73,7 @@ bazel_dep( ) bazel_dep( name = "aspect_bazel_lib", - version = "1.37.0", + version = "1.38.1", ) bazel_dep( name = "rules_proto", diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE index 69ea622ce..cc80bfa61 100644 --- a/rules_haskell_tests/WORKSPACE +++ b/rules_haskell_tests/WORKSPACE @@ -27,9 +27,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # For testing if bzlmod is enabled http_archive( name = "aspect_bazel_lib", - sha256 = "ce259cbac2e94a6dff01aff9455dcc844c8af141503b02a09c2642695b7b873e", - strip_prefix = "bazel-lib-1.37.0", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.37.0/bazel-lib-v1.37.0.tar.gz", + sha256 = "262e3d6693cdc16dd43880785cdae13c64e6a3f63f75b1993c716295093d117f", + strip_prefix = "bazel-lib-1.38.1", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.38.1/bazel-lib-v1.38.1.tar.gz", ) load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows") From 39a58ce3b3c0eeb905be1a46d8ac7a213acf7599 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Nov 2023 22:05:20 +0000 Subject: [PATCH 4/5] chore(deps): update dependency rules_pkg to v0.9.1 --- haskell/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index cc53dee4a..6ad99ab40 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -157,10 +157,10 @@ def rules_haskell_dependencies(): http_archive, name = "rules_pkg", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.1/rules_pkg-0.7.1.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.1/rules_pkg-0.7.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz", ], - sha256 = "451e08a4d78988c06fa3f9306ec813b836b1d076d0f055595444ba4ff22b867f", + sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8", ) # For --incompatible_disable_starlark_host_transitions support (default in bazel 7) From 9b96e12057e62360ac7735ec6cfa4eb8781a1633 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Nov 2023 22:05:17 +0000 Subject: [PATCH 5/5] chore(deps): update dependency rules_jvm_external to v5.3 --- 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 d9a7512ac..3bc232086 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -234,7 +234,7 @@ use_repo( # Java dependencies for the //tests/java_classpath test bazel_dep( name = "rules_jvm_external", - version = "5.1", + version = "5.3", ) maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")