Ryan Hughes
124b067694
actions/upload-artifact rejects any path containing ':', and makepkg names a package with an epoch `name-1:ver-rel-arch.pkg.tar.zst`. Every PR that built such a package (cursor-cli in the sync PRs, omasnap once it gained an epoch) failed at "Upload artifact" after a successful build, and publish then rebuilt from scratch on merge. The files now ride inside packages.tar for the artifact hop and come back out with makepkg's names untouched: pacman clients and bin/publish-artifact both require the filename to match PKGINFO, and the channels already carry these names. publish.yml still accepts bare pre-packing artifacts until the 7-day retention drains them. helpers/artifact-helpers.sh holds both halves; tests/artifact-helpers.sh covers the round trip and runs with the other self-tests.
37 lines
2.0 KiB
Bash
Executable File
37 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
# Self-test for helpers/artifact-helpers.sh: package files survive the
|
|
# artifact hop between build-pr.yml and publish.yml with makepkg's names
|
|
# intact, including the colon an epoch puts in them.
|
|
set -euo pipefail
|
|
ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..")
|
|
source "$ROOT/helpers/artifact-helpers.sh"
|
|
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
|
|
pass() { echo "PASS: $1"; }
|
|
fail() { echo "FAIL: $1"; exit 1; }
|
|
|
|
EPOCH='cursor-cli-1:2026.09.18.1.9a7762b-1-x86_64.pkg.tar.zst'
|
|
PLAIN='beta-1.0-1-x86_64.pkg.tar.zst'
|
|
mkdir -p "$T/built" "$T/artifact" "$T/out"
|
|
echo epoch > "$T/built/$EPOCH"
|
|
echo plain > "$T/built/$PLAIN"
|
|
echo sig > "$T/built/$PLAIN.sig"
|
|
echo db > "$T/built/omarchy.db.tar.zst"
|
|
|
|
pack_packages "$T/built" "$T/artifact/packages.tar" || fail "pack"
|
|
[[ "$(tar -tf "$T/artifact/packages.tar" | sort | tr '\n' ' ')" == "$PLAIN $EPOCH " ]] \
|
|
&& pass "packages.tar holds the packages only, no signature or database" || fail "tar contents: $(tar -tf "$T/artifact/packages.tar" | tr '\n' ' ')"
|
|
[[ "$(ls "$T/artifact")" == "packages.tar" ]] && pass "the artifact path carries no colon" || fail "artifact listing"
|
|
|
|
unpack_packages "$T/artifact" "$T/out" || fail "unpack"
|
|
[[ "$(ls "$T/out" | sort | tr '\n' ' ')" == "$PLAIN $EPOCH " && "$(cat "$T/out/$EPOCH")" == epoch ]] \
|
|
&& pass "epoch filename and bytes survive the round trip" || fail "round trip: $(ls "$T/out" | tr '\n' ' ')"
|
|
|
|
# An artifact uploaded before packing existed: bare package files.
|
|
mkdir -p "$T/old" "$T/out2"; cp "$T/built"/*.pkg.tar.zst "$T/old/"
|
|
unpack_packages "$T/old" "$T/out2" && [[ "$(ls "$T/out2" | sort | tr '\n' ' ')" == "$PLAIN $EPOCH " ]] \
|
|
&& pass "a bare pre-packing artifact still unpacks" || fail "bare artifact"
|
|
|
|
mkdir -p "$T/empty"
|
|
if pack_packages "$T/empty" "$T/x.tar" 2>/dev/null; then fail "packing an empty build dir should fail"; else pass "empty build dir refused"; fi
|
|
if unpack_packages "$T/empty" "$T/out3" 2>/dev/null; then fail "an empty artifact should fail"; else pass "empty artifact refused"; fi
|