diff options
| author | Carl Dong <contact@carldong.me> | 2021-05-03 13:12:15 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-05-03 13:18:19 -0400 |
| commit | feda2c8e3180cb983c35976d4440cea23a155b7f (patch) | |
| tree | 7510401f056e7905b115862de543a6ac80a91fb7 /contrib | |
| parent | d522d8006b891eccd7901faf391f9c041ddf8e38 (diff) | |
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.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/guix/guix-attest | 4 | ||||
| -rw-r--r-- | contrib/guix/libexec/build.sh | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/contrib/guix/guix-attest b/contrib/guix/guix-attest index 5093dcb69d..8b4746caf9 100755 --- a/contrib/guix/guix-attest +++ b/contrib/guix/guix-attest @@ -146,6 +146,10 @@ echo "" # MAIN LOGIC: Loop through each output for VERSION and attest to output in # GUIX_SIGS_REPO as SIGNER, if attestation does not exist for outdir in "${OUTDIRS[@]}"; do + if [ -e "${outdir}/SKIPATTEST.TAG" ]; then + echo "${outname}: SKIPPING: Output directory marked with SKIPATTEST.TAG file" + continue + fi outname="$(out_name "$outdir")" outsigdir="$(out_sig_dir "$outdir")" if [ -e "$outsigdir" ]; then diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index ce61cd52c7..fccd5d1b08 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -228,6 +228,7 @@ GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz" # Create the source tarball if not already there if [ ! -e "$GIT_ARCHIVE" ]; then mkdir -p "$(dirname "$GIT_ARCHIVE")" + touch "${DIST_ARCHIVE_BASE}"/SKIPATTEST.TAG git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD fi |