From 6d098c8a6b80b86eda05c25996927e207c9878d8 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 21 May 2024 11:34:18 +0100 Subject: [PATCH] fix: rolled back `pigz` version `pigz` is being downgraded because with the current version decompression fails[1]: ```sh $ curl -sLf https://github.com/ahgamut/superconfigure/releases/download/z0.0.39/compress.zip -o compress.zip $ unzip compress.zip $ echo "Hello, world" > hello-world.txt $ ./bin/pigz hello-world.txt $ ./bin/pigz -cdkv hello-world.txt.gz --stdout > hello-world.txt~ (segmentation fault) ``` The `3.2.4` binary worked fine, so we are rolling back to that for now. When a new version of `cosmos` binaries have been released, we should check that the decompression works and upgrade. [1]: https://github.com/ahgamut/superconfigure/issues/38 --- MODULE.bazel | 30 ++++++++++++- MODULE.bazel.lock | 98 +++++++++++++++++++++---------------------- e2e/MODULE.bazel.lock | 98 +++++++++++++++++++++---------------------- 3 files changed, 127 insertions(+), 99 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 17b5a2a6..3142711f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -209,7 +209,7 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain "paste": "sha256-d37G1PptmT8DvFYb0A51tHRAONW3k2xq4y8pFnbR/FA=", "patch": "sha256-dUVoOS8qaaVAsTlHp5DnupNPB02ZBfVBYUNoFEQVfY4=", "pathchk": "sha256-qjcLXvmgW3bbARJqpE5PF1LdaVrvnQZVsmBFgTM5/JY=", - "pigz": "sha256-pvWipO8MGunU157lNj5pkNwMwDYSUFjtx7nWoNxBDw8=", + # "pigz": "sha256-pvWipO8MGunU157lNj5pkNwMwDYSUFjtx7nWoNxBDw8=", "pinky": "sha256-cCtYw56s7y1pYOCm/PNgp1Y+pgf8K0UjVVsikUIoJQE=", "pledge": "sha256-eaFRVXB2hGp2o9lYNSP+bb+sxOQ04bqCU2mDEmSIRN0=", "pr": "sha256-Cd292alJ/36s1BOyfPj+SDDCuMGsgduzsjHspANOguU=", @@ -284,3 +284,31 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain "zstd": "sha256-UQRCbSiHGWmBr2qsbnsCGQjIyhZG2ilfx9Iyxv6KbzQ=", }.items() ] + +# TODO: remove these when we upgrade to 3.3.1+ +# `pigz` is here because `3.3.1` decompression fails +[ + ( + download_file( + name = "cosmos-{}".format(binary), + executable = True, + integrity = integrity, + output = binary, + urls = [ + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.2.4/{}".format(binary), + "https://cosmo.zip/pub/cosmos/v/3.2.4/bin/{}".format(binary), + ], + ), + ape_entrypoint( + name = binary, + binary = "@cosmos-{}//:{}".format(binary, binary), + ), + export.symlink( + name = "ape-{}".format(binary), + target = "@{}".format(binary), + ), + ) + for binary, integrity in { + "pigz": "sha256-KReMrcHfifpjgxeb/k4WNl6ZtgJwfDIf9mTbcEldR0w=", + }.items() +] \ No newline at end of file diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 59e53a35..09be84cf 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 6, - "moduleFileHash": "5b830ff9e62fe08356a7fc2ed42e74691513fd08f1509660fa78b3e4ad27dfab", + "moduleFileHash": "e6fa21f84755fba45b9b6cd66a88df2ac2113df35725e1fe43b11bdd7b1f05df", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -208,8 +208,6 @@ "patch": "patch", "cosmos-pathchk": "cosmos-pathchk", "pathchk": "pathchk", - "cosmos-pigz": "cosmos-pigz", - "pigz": "pigz", "cosmos-pinky": "cosmos-pinky", "pinky": "pinky", "cosmos-pledge": "cosmos-pledge", @@ -353,7 +351,9 @@ "cosmos-zsh": "cosmos-zsh", "zsh": "zsh", "cosmos-zstd": "cosmos-zstd", - "zstd": "zstd" + "zstd": "zstd", + "cosmos-pigz": "cosmos-pigz", + "pigz": "pigz" }, "devImports": [], "tags": [ @@ -3126,38 +3126,6 @@ "column": 23 } }, - { - "tagName": "@download_utils//download/file:defs.bzl%download_file", - "attributeValues": { - "executable": true, - "integrity": "sha256-pvWipO8MGunU157lNj5pkNwMwDYSUFjtx7nWoNxBDw8=", - "output": "pigz", - "urls": [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.3.1/pigz", - "https://cosmo.zip/pub/cosmos/v/3.3.1/bin/pigz" - ], - "name": "cosmos-pigz" - }, - "devDependency": false, - "location": { - "file": "@@//:MODULE.bazel", - "line": 111, - "column": 22 - } - }, - { - "tagName": "//ape/entrypoint:defs.bzl%ape_entrypoint", - "attributeValues": { - "binary": "@cosmos-pigz//:pigz", - "name": "pigz" - }, - "devDependency": false, - "location": { - "file": "@@//:MODULE.bazel", - "line": 121, - "column": 23 - } - }, { "tagName": "@download_utils//download/file:defs.bzl%download_file", "attributeValues": { @@ -5461,6 +5429,38 @@ "line": 121, "column": 23 } + }, + { + "tagName": "@download_utils//download/file:defs.bzl%download_file", + "attributeValues": { + "executable": true, + "integrity": "sha256-KReMrcHfifpjgxeb/k4WNl6ZtgJwfDIf9mTbcEldR0w=", + "output": "pigz", + "urls": [ + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.2.4/pigz", + "https://cosmo.zip/pub/cosmos/v/3.2.4/bin/pigz" + ], + "name": "cosmos-pigz" + }, + "devDependency": false, + "location": { + "file": "@@//:MODULE.bazel", + "line": 291, + "column": 22 + } + }, + { + "tagName": "//ape/entrypoint:defs.bzl%ape_entrypoint", + "attributeValues": { + "binary": "@cosmos-pigz//:pigz", + "name": "pigz" + }, + "devDependency": false, + "location": { + "file": "@@//:MODULE.bazel", + "line": 301, + "column": 23 + } } ], "hasDevUseExtension": false, @@ -6531,19 +6531,6 @@ "column": 23 } }, - { - "tagName": "symlink", - "attributeValues": { - "name": "ape-pigz", - "target": "@pigz" - }, - "devDependency": false, - "location": { - "file": "@@//:MODULE.bazel", - "line": 125, - "column": 23 - } - }, { "tagName": "symlink", "attributeValues": { @@ -7479,6 +7466,19 @@ "line": 125, "column": 23 } + }, + { + "tagName": "symlink", + "attributeValues": { + "name": "ape-pigz", + "target": "@pigz" + }, + "devDependency": false, + "location": { + "file": "@@//:MODULE.bazel", + "line": 305, + "column": 23 + } } ], "hasDevUseExtension": false, diff --git a/e2e/MODULE.bazel.lock b/e2e/MODULE.bazel.lock index 851716b0..52e26201 100644 --- a/e2e/MODULE.bazel.lock +++ b/e2e/MODULE.bazel.lock @@ -14,7 +14,7 @@ }, "localOverrideHashes": { "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0", - "ape": "5b830ff9e62fe08356a7fc2ed42e74691513fd08f1509660fa78b3e4ad27dfab" + "ape": "e6fa21f84755fba45b9b6cd66a88df2ac2113df35725e1fe43b11bdd7b1f05df" }, "moduleDepGraph": { "": { @@ -392,8 +392,6 @@ "patch": "patch", "cosmos-pathchk": "cosmos-pathchk", "pathchk": "pathchk", - "cosmos-pigz": "cosmos-pigz", - "pigz": "pigz", "cosmos-pinky": "cosmos-pinky", "pinky": "pinky", "cosmos-pledge": "cosmos-pledge", @@ -537,7 +535,9 @@ "cosmos-zsh": "cosmos-zsh", "zsh": "zsh", "cosmos-zstd": "cosmos-zstd", - "zstd": "zstd" + "zstd": "zstd", + "cosmos-pigz": "cosmos-pigz", + "pigz": "pigz" }, "devImports": [], "tags": [ @@ -3310,38 +3310,6 @@ "column": 23 } }, - { - "tagName": "@download_utils//download/file:defs.bzl%download_file", - "attributeValues": { - "executable": true, - "integrity": "sha256-pvWipO8MGunU157lNj5pkNwMwDYSUFjtx7nWoNxBDw8=", - "output": "pigz", - "urls": [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.3.1/pigz", - "https://cosmo.zip/pub/cosmos/v/3.3.1/bin/pigz" - ], - "name": "cosmos-pigz" - }, - "devDependency": false, - "location": { - "file": "@@ape~//:MODULE.bazel", - "line": 111, - "column": 22 - } - }, - { - "tagName": "//ape/entrypoint:defs.bzl%ape_entrypoint", - "attributeValues": { - "binary": "@cosmos-pigz//:pigz", - "name": "pigz" - }, - "devDependency": false, - "location": { - "file": "@@ape~//:MODULE.bazel", - "line": 121, - "column": 23 - } - }, { "tagName": "@download_utils//download/file:defs.bzl%download_file", "attributeValues": { @@ -5645,6 +5613,38 @@ "line": 121, "column": 23 } + }, + { + "tagName": "@download_utils//download/file:defs.bzl%download_file", + "attributeValues": { + "executable": true, + "integrity": "sha256-KReMrcHfifpjgxeb/k4WNl6ZtgJwfDIf9mTbcEldR0w=", + "output": "pigz", + "urls": [ + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.2.4/pigz", + "https://cosmo.zip/pub/cosmos/v/3.2.4/bin/pigz" + ], + "name": "cosmos-pigz" + }, + "devDependency": false, + "location": { + "file": "@@ape~//:MODULE.bazel", + "line": 291, + "column": 22 + } + }, + { + "tagName": "//ape/entrypoint:defs.bzl%ape_entrypoint", + "attributeValues": { + "binary": "@cosmos-pigz//:pigz", + "name": "pigz" + }, + "devDependency": false, + "location": { + "file": "@@ape~//:MODULE.bazel", + "line": 301, + "column": 23 + } } ], "hasDevUseExtension": false, @@ -6715,19 +6715,6 @@ "column": 23 } }, - { - "tagName": "symlink", - "attributeValues": { - "name": "ape-pigz", - "target": "@pigz" - }, - "devDependency": false, - "location": { - "file": "@@ape~//:MODULE.bazel", - "line": 125, - "column": 23 - } - }, { "tagName": "symlink", "attributeValues": { @@ -7663,6 +7650,19 @@ "line": 125, "column": 23 } + }, + { + "tagName": "symlink", + "attributeValues": { + "name": "ape-pigz", + "target": "@pigz" + }, + "devDependency": false, + "location": { + "file": "@@ape~//:MODULE.bazel", + "line": 305, + "column": 23 + } } ], "hasDevUseExtension": false, -- GitLab