From c5a24cc500fdd45699d59c038e7871e44880026a Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Tue, 1 Oct 2024 12:49:15 +0100 Subject: [PATCH 1/2] chore: enable built XZ compression tool The current `@ape//ape:xz` tool has intermittent broken pipe failures. This can likely be fixed upstream by using a more recent `superconfigure` binary. For now, we can override and use the Bazel provided XZ tool. Ultimately, it is likely better in the long run to use the Bazel built tool. It would be nice to use APE tools where we can though. At some point, later, we can try switching back to the default compression tools. --- .bazelrc | 3 ++- MODULE.bazel | 1 + MODULE.bazel.lock | 5 ++++- e2e/.bazelrc | 3 ++- e2e/MODULE.bazel | 1 + e2e/MODULE.bazel.lock | 5 ++++- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bazelrc b/.bazelrc index 1eb348b6..2ceba075 100644 --- a/.bazelrc +++ b/.bazelrc @@ -22,8 +22,9 @@ common --attempt_to_print_relative_paths # Enable hermetic `rules_python` common --@rules_labgrid//python:bootstrap=script -# Enable built Zstandard toolchain +# Enable built compression toolchains common --extra_toolchains=@rules_zstd//zstd/toolchain/zstd:built +common --extra_toolchains=@rules_xz//xz/toolchain/xz:built # User-specific .bazelrc try-import %workspace%/.bazelrc.user diff --git a/MODULE.bazel b/MODULE.bazel index e6744440..188ec2d4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -12,6 +12,7 @@ bazel_dep(name = "rules_python", version = "0.33.2") bazel_dep(name = "ape", version = "1.0.0-beta.12") bazel_dep(name = "download_utils", version = "1.0.0-beta.2") bazel_dep(name = "rules_tar", version = "1.0.0-beta.3") +bazel_dep(name = "rules_xz", version = "1.0.0-beta.3") bazel_dep(name = "rules_zstd", version = "1.0.0-beta.3") bazel_dep(name = "platforms", version = "0.0.10") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index bdaad19e..3a0f33ac 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -97,7 +97,8 @@ "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", "https://bcr.bazel.build/modules/rules_tar/1.0.0-beta.3/MODULE.bazel": "not found", "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/MODULE.bazel": "0934987548deaa03cca973e6e700d88daadb736d816af5907e93633747c7a9c5", - "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/source.json": "155e565725363efca12521ef8c30551978c48e6f3b4640fc6796c3dbcae73d81", + "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.3/MODULE.bazel": "c0e0ee989d636e09ef61665a40a518e452d25b40666bbca13f96b157d1fb7fb0", + "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.3/source.json": "b72dd3fe42e0558b85815cde3710dfa7f01ee96aeb5b2490a1e150f96535b428", "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.1/MODULE.bazel": "979e286e40ec27423d4c93ff15e3e17b212e8b83b07157d3c61d1f265c4fa16a", "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.3/MODULE.bazel": "not found", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", @@ -108,6 +109,8 @@ "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.9/MODULE.bazel": "9a8edfa6905229b899225489cbd6db36f073d9455c77238bd6ae6c52da5256d8", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459", + "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/MODULE.bazel": "2cbf58a2875e7f23ab77073902e009bfce25481fac231f950b89d57d441d5ef3", + "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72", diff --git a/e2e/.bazelrc b/e2e/.bazelrc index 1eb348b6..2ceba075 100644 --- a/e2e/.bazelrc +++ b/e2e/.bazelrc @@ -22,8 +22,9 @@ common --attempt_to_print_relative_paths # Enable hermetic `rules_python` common --@rules_labgrid//python:bootstrap=script -# Enable built Zstandard toolchain +# Enable built compression toolchains common --extra_toolchains=@rules_zstd//zstd/toolchain/zstd:built +common --extra_toolchains=@rules_xz//xz/toolchain/xz:built # User-specific .bazelrc try-import %workspace%/.bazelrc.user diff --git a/e2e/MODULE.bazel b/e2e/MODULE.bazel index a90786bb..2703da0b 100644 --- a/e2e/MODULE.bazel +++ b/e2e/MODULE.bazel @@ -10,6 +10,7 @@ bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.14") bazel_dep(name = "rules_python", version = "0.33.2") bazel_dep(name = "rules_diff", version = "1.0.0-beta.3") bazel_dep(name = "rules_zstd", version = "1.0.0-beta.3") +bazel_dep(name = "rules_xz", version = "1.0.0-beta.3") bazel_dep(name = "ape", version = "1.0.0-beta.12") bazel_dep(name = "rules_labgrid") local_path_override( diff --git a/e2e/MODULE.bazel.lock b/e2e/MODULE.bazel.lock index c143b3bc..51d4954e 100644 --- a/e2e/MODULE.bazel.lock +++ b/e2e/MODULE.bazel.lock @@ -99,7 +99,8 @@ "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", "https://bcr.bazel.build/modules/rules_tar/1.0.0-beta.3/MODULE.bazel": "not found", "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/MODULE.bazel": "0934987548deaa03cca973e6e700d88daadb736d816af5907e93633747c7a9c5", - "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.1/source.json": "155e565725363efca12521ef8c30551978c48e6f3b4640fc6796c3dbcae73d81", + "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.3/MODULE.bazel": "c0e0ee989d636e09ef61665a40a518e452d25b40666bbca13f96b157d1fb7fb0", + "https://bcr.bazel.build/modules/rules_xz/1.0.0-beta.3/source.json": "b72dd3fe42e0558b85815cde3710dfa7f01ee96aeb5b2490a1e150f96535b428", "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.1/MODULE.bazel": "979e286e40ec27423d4c93ff15e3e17b212e8b83b07157d3c61d1f265c4fa16a", "https://bcr.bazel.build/modules/rules_zstd/1.0.0-beta.3/MODULE.bazel": "not found", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", @@ -110,6 +111,8 @@ "https://bcr.bazel.build/modules/toolchain_utils/1.0.0-beta.9/MODULE.bazel": "9a8edfa6905229b899225489cbd6db36f073d9455c77238bd6ae6c52da5256d8", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459", + "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/MODULE.bazel": "2cbf58a2875e7f23ab77073902e009bfce25481fac231f950b89d57d441d5ef3", + "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72", -- GitLab From 185bfb111d26979170385098570e3bec0ea3c612 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Tue, 1 Oct 2024 13:33:16 +0100 Subject: [PATCH 2/2] chore: bump Bazel to `7.3.1` --- .bazelversion | 2 +- MODULE.bazel.lock | 8 ++++---- e2e/.bazelversion | 2 +- e2e/MODULE.bazel.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bazelversion b/.bazelversion index 0ee843cc..643916c0 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.2.0 +7.3.1 diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 3a0f33ac..1d1ba834 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -76,8 +76,8 @@ "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.1/source.json": "cd92050d1eb80a80f1bac8e94ec7d99ffc58e2e6ae2cd18bdcf8efd3e44a2b8f", "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", - "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/7.6.1/source.json": "8f3f3076554e1558e8e468b2232991c510ecbcbed9e6f8c06ac31c93bcf38362", + "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", + "https://bcr.bazel.build/modules/rules_java/7.6.5/source.json": "a805b889531d1690e3c72a7a7e47a870d00323186a9904b36af83aa3d053ee8d", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35", "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0", @@ -113,8 +113,8 @@ "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", - "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72", - "https://bcr.bazel.build/modules/zlib/1.3/source.json": "b6b43d0737af846022636e6e255fd4a96fee0d34f08f3830e6e0bac51465c37c", + "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", + "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d", "https://bcr.bazel.build/modules/zstd/1.5.6/MODULE.bazel": "471ebe7d3cdd8c6469390fcf623eb4779ff55fbee0a87f1dc57a1def468b96d4", "https://bcr.bazel.build/modules/zstd/1.5.6/source.json": "02010c3333fc89b44fe861db049968decb6e688411f7f9d4f6791d74f9adfb51", "https://gitlab.arm.com/bazel/rules_tar/-/releases/v1.0.0-beta.3/downloads/bazel_registry.json": "not found", diff --git a/e2e/.bazelversion b/e2e/.bazelversion index 0ee843cc..643916c0 100644 --- a/e2e/.bazelversion +++ b/e2e/.bazelversion @@ -1 +1 @@ -7.2.0 +7.3.1 diff --git a/e2e/MODULE.bazel.lock b/e2e/MODULE.bazel.lock index 51d4954e..f51e7aa3 100644 --- a/e2e/MODULE.bazel.lock +++ b/e2e/MODULE.bazel.lock @@ -78,8 +78,8 @@ "https://bcr.bazel.build/modules/rules_gzip/1.0.0-beta.1/source.json": "cd92050d1eb80a80f1bac8e94ec7d99ffc58e2e6ae2cd18bdcf8efd3e44a2b8f", "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", - "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/7.6.1/source.json": "8f3f3076554e1558e8e468b2232991c510ecbcbed9e6f8c06ac31c93bcf38362", + "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", + "https://bcr.bazel.build/modules/rules_java/7.6.5/source.json": "a805b889531d1690e3c72a7a7e47a870d00323186a9904b36af83aa3d053ee8d", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35", "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0", @@ -115,8 +115,8 @@ "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", - "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72", - "https://bcr.bazel.build/modules/zlib/1.3/source.json": "b6b43d0737af846022636e6e255fd4a96fee0d34f08f3830e6e0bac51465c37c", + "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", + "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d", "https://bcr.bazel.build/modules/zstd/1.5.6/MODULE.bazel": "471ebe7d3cdd8c6469390fcf623eb4779ff55fbee0a87f1dc57a1def468b96d4", "https://bcr.bazel.build/modules/zstd/1.5.6/source.json": "02010c3333fc89b44fe861db049968decb6e688411f7f9d4f6791d74f9adfb51", "https://gitlab.arm.com/bazel/rules_tar/-/releases/v1.0.0-beta.3/downloads/bazel_registry.json": "not found", -- GitLab