Skip to content

Commit feda2c8

Browse files
committed
guix: Skip attesting to dist-archive
We already attest to the relevant dist-archive in inputs.SHA256SUMS, which is recorded at build-time. We use a SKIPATTEST.TAG file to indicate output directories which do not require attestation (much like the CACHEDIR.TAG specification). Generally, it's better to have build scripts declare properties of directories instead of introducing name-based special cases in attest scripts since build scripts have a more detailed context of what is going on.
1 parent d522d80 commit feda2c8

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

contrib/guix/guix-attest

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ echo ""
146146
# MAIN LOGIC: Loop through each output for VERSION and attest to output in
147147
# GUIX_SIGS_REPO as SIGNER, if attestation does not exist
148148
for outdir in "${OUTDIRS[@]}"; do
149+
if [ -e "${outdir}/SKIPATTEST.TAG" ]; then
150+
echo "${outname}: SKIPPING: Output directory marked with SKIPATTEST.TAG file"
151+
continue
152+
fi
149153
outname="$(out_name "$outdir")"
150154
outsigdir="$(out_sig_dir "$outdir")"
151155
if [ -e "$outsigdir" ]; then

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz"
228228
# Create the source tarball if not already there
229229
if [ ! -e "$GIT_ARCHIVE" ]; then
230230
mkdir -p "$(dirname "$GIT_ARCHIVE")"
231+
touch "${DIST_ARCHIVE_BASE}"/SKIPATTEST.TAG
231232
git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD
232233
fi
233234

0 commit comments

Comments
 (0)