Pin PKGEXT to .pkg.tar.zst in the builder image
Arch Linux ARM's makepkg.conf defaults PKGEXT to .pkg.tar.xz. build/sign.sh only signs *.pkg.tar.zst, and push-build, sync-rebuilds and the notifier parse the same suffix, so an aarch64 package built under the stacked pipeline came out as .xz and would have been skipped at signing. Seen on a plain x86_64 runner building aarch64 under QEMU (fork run 33642125077). Same fix as the PKGEXT line in #240.
This commit is contained in:
1 parent
91843ab099
commit
b677f50358
1 file changed
+6
-1
+6
-1
@@ -142,8 +142,13 @@ RUN useradd -m -G wheel -s /bin/bash builder && \
|
||||
chmod 700 /home/builder/.gnupg && \
|
||||
chown -R builder:builder /home/builder
|
||||
|
||||
# Arch Linux ARM's makepkg.conf still defaults PKGEXT to .pkg.tar.xz; every
|
||||
# tool downstream of the build (sign.sh, push-build, sync-rebuilds, the
|
||||
# notifier) expects .pkg.tar.zst, so an aarch64 package would build and then
|
||||
# be skipped at signing. Pin the extension so both architectures match.
|
||||
RUN sed -i 's/^#MAKEFLAGS=.*/MAKEFLAGS="-j$(nproc)"/' /etc/makepkg.conf && \
|
||||
sed -i 's/^COMPRESSZST=.*/COMPRESSZST=(zstd -c -z -q --threads=0 -)/' /etc/makepkg.conf
|
||||
sed -i 's/^COMPRESSZST=.*/COMPRESSZST=(zstd -c -z -q --threads=0 -)/' /etc/makepkg.conf && \
|
||||
sed -i "s|^PKGEXT=.*|PKGEXT='.pkg.tar.zst'|" /etc/makepkg.conf
|
||||
|
||||
# Pacman wrapper that auto-resolves package conflicts (e.g. rustup vs rust).
|
||||
# makepkg only passes --noconfirm to pacman, which defaults to 'N' on conflict
|
||||
|
||||
Reference in new issue
Block a user