Skip to content

Commit 18d9966

Browse files
committed
ci: make guix-check print out the set of hashes compared against
The ad-hoc generation method we use now can't be compared against the attested checksums on dashpay/guix.sigs, so we resort to using a creative use of guix-attest to generate the exact set of checksums that an attestor would generate.
1 parent 90f2581 commit 18d9966

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

contrib/containers/guix/scripts/entrypoint

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ SERVERS=(
1818
)
1919

2020
# Start the Guix daemon
21-
IFS_OLD="${IFS}"
22-
IFS=' '
2321
sudo env PATH=${PATH} \
24-
guix-daemon --build-users-group='guixbuild' --substitute-urls="${SERVERS[*]}" < /dev/null 2>&1 |
22+
guix-daemon --build-users-group='guixbuild' --substitute-urls="$(IFS=' '; echo "${SERVERS[*]}")" < /dev/null 2>&1 |
2523
sudo tee /var/log/guix.log > /dev/null &
26-
IFS="${IFS_OLD}"
2724

2825
# Hand over control
2926
exec bash

contrib/containers/guix/scripts/guix-check

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ cd "$WORKSPACE_PATH"
1313

1414
source "contrib/guix/libexec/prelude.bash"
1515

16-
printf "\nBinaries:\n\n"
17-
( \
18-
SRC_PATH_PREFIX="${VERSION_BASE}/distsrc-" && \
19-
sha256sum ${SRC_PATH_PREFIX}*/src/dash{d,-cli,-tx,-wallet}{,.exe} && \
20-
sha256sum ${SRC_PATH_PREFIX}*/src/qt/dash-qt{,.exe} && \
21-
sha256sum ${SRC_PATH_PREFIX}*/src/test/test_dash{,.exe} \
22-
) | sort -k 2
23-
24-
printf "\nArchives:\n\n"
25-
find "${OUTDIR_BASE}" -type f | grep -v SHA256 | xargs sha256sum | sort -k 2
16+
GUIX_SIGS_REPO="$(mktemp -d)"
17+
trap 'rm -rf -- "$GUIX_SIGS_REPO"' EXIT
18+
SIGNER=dummy
19+
env GUIX_SIGS_REPO="${GUIX_SIGS_REPO}" NO_SIGN=1 SIGNER=${SIGNER} ./contrib/guix/guix-attest
20+
SHASUM_LOC="${GUIX_SIGS_REPO}/${VERSION}/${SIGNER}"
21+
cat "${SHASUM_LOC}/all.sha256sums" 2>/dev/null || cat "${SHASUM_LOC}/noncodesigned.SHA256SUMS"

0 commit comments

Comments
 (0)