Skip to content

Accept xz prebuilt archives #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
macayu17 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Accept xz prebuilt archives #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ea2b1
Accept xz prebuilt archives
macayu17 Sep 15, 2026
4ee3a87
Test gzip prebuilt archives
macayu17 Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions pythons/test/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ fail() {
}

write_meta() {
cat > binaries/3.14.0-ubuntu-24.04-x86_64.meta <<EOF
local name="${2:-3.14.0-ubuntu-24.04-x86_64}"
cat > "binaries/$name.meta" <<EOF
# pyenv-binary metadata
version=3.14.0
version=${name%%-*}
os=Linux
arch=x86_64
platform=linux-x86_64
distro=ubuntu 24.04
libc=glibc 2.39
build_prefix=/tmp/pyenv/versions/3.14.0-ubuntu-24.04-x86_64
build_prefix=/tmp/pyenv/versions/$name
archive=$1
EOF
}
Expand All @@ -28,24 +29,36 @@ trap 'rm -rf "$tmpdir"' EXIT

cp update.sh index.html "$tmpdir"
mkdir "$tmpdir/binaries"
printf archive-data > "$tmpdir/binaries/3.14.0-ubuntu-24.04-x86_64.tar.gz"
printf archive-data > "$tmpdir/binaries/3.14.0-ubuntu-24.04-x86_64.tar.xz"
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
printf definition > "$tmpdir/binaries/3.14.0-ubuntu-24.04-x86_64"
gzip_name=3.13.0-ubuntu-24.04-x86_64
printf gzip-archive-data > "$tmpdir/binaries/$gzip_name.tar.gz"
printf definition > "$tmpdir/binaries/$gzip_name"

cd "$tmpdir"
write_meta 3.14.0-ubuntu-24.04-x86_64.tar.gz
write_meta 3.14.0-ubuntu-24.04-x86_64.tar.xz
write_meta "$gzip_name.tar.gz" "$gzip_name"
bash ./update.sh >/dev/null 2>&1 || fail "update failed"

sha=8a6111c3ca752ed6d5f8e8a6daa3ba4b8c3b0bf55f00a87ac2b285024ef87e5f
[ "binaries/3.14.0-ubuntu-24.04-x86_64.tar.gz" -ef "$sha" ] ||
[ "binaries/3.14.0-ubuntu-24.04-x86_64.tar.xz" -ef "$sha" ] ||
fail "checksum path is not a hardlink to the archive"

entry='<li><a href="binaries/3.14.0-ubuntu-24.04-x86_64.tar.gz">3.14.0-ubuntu-24.04-x86_64.tar.gz</a> (<a href="binaries/3.14.0-ubuntu-24.04-x86_64">definition</a>)</li>'
entry='<li><a href="binaries/3.14.0-ubuntu-24.04-x86_64.tar.xz">3.14.0-ubuntu-24.04-x86_64.tar.xz</a> (<a href="binaries/3.14.0-ubuntu-24.04-x86_64">definition</a>)</li>'
grep -Fqx "$entry" index.html || fail "prebuilt archive is missing from index.html"

gzip_sha=c809857f5fa564e1a2fdb3618161114bfb9a9c624ade6b580f6d79df0adfcc26
[ "binaries/$gzip_name.tar.gz" -ef "$gzip_sha" ] ||
fail "gzip checksum path is not a hardlink to the archive"

gzip_entry="<li><a href=\"binaries/$gzip_name.tar.gz\">$gzip_name.tar.gz</a> (<a href=\"binaries/$gzip_name\">definition</a>)</li>"
grep -Fqx "$gzip_entry" index.html || fail "gzip prebuilt archive is missing from index.html"

cp index.html index.before
bash ./update.sh >/dev/null 2>&1 || fail "second update failed"
cmp -s index.before index.html || fail "second update changed index.html"
[ "$(grep -Fxc "$entry" index.html)" -eq 1 ] || fail "prebuilt archive is listed more than once"
[ "$(grep -Fxc "$gzip_entry" index.html)" -eq 1 ] || fail "gzip prebuilt archive is listed more than once"

bad_name=$'bad\nname'
printf 'archive=bad\narchive=name.tar.gz\n' > "binaries/$bad_name.meta"
Expand Down Expand Up @@ -83,14 +96,14 @@ if bash ./update.sh >/dev/null 2>&1; then
fail "update accepted an archive outside binaries"
fi

write_meta 3.14.0-ubuntu-24.04-x86_64.tar.gz
write_meta 3.14.0-ubuntu-24.04-x86_64.tar.xz
rm binaries/3.14.0-ubuntu-24.04-x86_64
if bash ./update.sh >/dev/null 2>&1; then
fail "update accepted a missing definition"
fi

printf definition > binaries/3.14.0-ubuntu-24.04-x86_64
rm binaries/3.14.0-ubuntu-24.04-x86_64.tar.gz
rm binaries/3.14.0-ubuntu-24.04-x86_64.tar.xz
if bash ./update.sh >/dev/null 2>&1; then
fail "update accepted a missing archive"
fi
Expand Down
7 changes: 5 additions & 2 deletions pythons/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,13 @@ for meta in binaries/*.meta; do
exit 1
;;
esac
if [ "$archive" != "$name.tar.gz" ]; then
case "$archive" in
"$name.tar.gz" | "$name.tar.xz") ;;
*)
echo "Invalid archive in $meta" >&2
exit 1
fi
;;
esac
if [ ! -f "binaries/$archive" ] || [ ! -f "binaries/$name" ]; then
echo "Missing archive or definition for $name" >&2
exit 1
Expand Down