diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-21 23:21:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-21 23:21:23 +0200 |
| commit | 21c1f3920a6dc43725d6fbfc2796524728a6ec81 (patch) | |
| tree | 6034249870c9035249a77d2530f7a0ee40406c23 /pkgs | |
| parent | 74856dd8455e7ca3a4e7a225f23ecf206a4fac18 (diff) | |
| parent | 84d940553855effc498c4bdfebc0b85e9973ec90 (diff) | |
Merge pull request #256560 from wegank/linkerd-hash
linkerd: fix update script
Diffstat (limited to 'pkgs')
| -rwxr-xr-x | pkgs/applications/networking/cluster/linkerd/update-edge.sh | 10 | ||||
| -rwxr-xr-x | pkgs/applications/networking/cluster/linkerd/update-stable.sh | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 0e5be4f197e13..f9d9569b3812c 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 19aa4274bed35..8643262ec3ad0 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi |