From 0754e9e3e331c4e7cbb129ba4a6bcfc02c104c45 Mon Sep 17 00:00:00 2001 From: Bendik Aagaard Lynghaug Date: Sun, 13 Sep 2026 11:05:38 +0200 Subject: [PATCH] CI: fix Arch-registry publish (use makepkg --packagelist; !strip for cross-arch repack) The runner's PKGEXT is .pkg.tar.xz, so the .zst glob never matched; --packagelist yields the exact filename, and options=('!strip') lets the foreign-arch binary be packaged on the aarch64 host without stripping. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01GLUwWE2KmFPzhKaf67tWbx --- .gitea/workflows/release.yml | 14 ++++++++++---- aur/PKGBUILD | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 77cfcf8..7435d40 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -138,12 +138,18 @@ jobs: # one host. Consumers: see the infrastructure README. - name: Publish to the Arch package registry run: | + set -euo pipefail cd aur + # Build both arches here (repackaging the released binaries) and + # push each to the instance Arch registry. Use --packagelist for + # the exact filename (honours the runner's PKGEXT/PKGDEST) rather + # than globbing, and !strip (in the PKGBUILD) so packaging the + # foreign-arch binary on this host does not try to strip it. for carch in aarch64 x86_64; do - rm -f ./*.pkg.tar.zst - CARCH=$carch makepkg -f --nodeps - curl --fail --user "${{ gitea.actor }}:${{ secrets.GITHUB_TOKEN }}" \ - --upload-file ./*-$carch.pkg.tar.zst \ + pkgfile=$(CARCH="$carch" makepkg --packagelist | tail -1) + CARCH="$carch" makepkg -f --nodeps --noconfirm --skipinteg + curl --fail-with-body --user "${{ gitea.actor }}:${{ secrets.GITHUB_TOKEN }}" \ + --upload-file "$pkgfile" \ "${{ gitea.server_url }}/api/packages/${{ gitea.repository_owner }}/arch/uhhm" done diff --git a/aur/PKGBUILD b/aur/PKGBUILD index da4f129..487092b 100644 --- a/aur/PKGBUILD +++ b/aur/PKGBUILD @@ -4,6 +4,7 @@ pkgver=0.2.5 pkgrel=1 pkgdesc="Web chat over NATS subjects with Kanidm SSO (Leptos SSR)" arch=('x86_64' 'aarch64') +options=('!strip') url="https://project.uhhm.no/bl/cnats" license=('MIT') depends=('glibc' 'gcc-libs')