diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-22 00:37:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 00:37:42 +0200 |
| commit | 3aa04e55b32939b4e4b6c3e39d4756500352d83f (patch) | |
| tree | 4dae289cbf4ac27499ab260a6275180a017c5b69 /pkgs | |
| parent | d32d520027fd9410e8d7c5a4a0dd7d263b6318b6 (diff) | |
| parent | e3ea6e8b2c541b20622c9f5adcaf713c646a4269 (diff) | |
Merge pull request #256580 from wegank/fluxcd-hash
fluxcd: fix update script
Diffstat (limited to 'pkgs')
| -rwxr-xr-x | pkgs/applications/networking/cluster/fluxcd/update.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 8c80ef9fda344..f252d587daaf3 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -21,16 +21,17 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then setKV version ${LATEST_VERSION} setKV sha256 ${SHA256} setKV manifestsSha256 ${SPEC_SHA256} - setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 + setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash set +e - VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + VENDOR_HASH=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + VENDOR_HASH=$(nix hash to-sri --type sha256 $VENDOR_HASH) set -e - 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 |