From ab8fbf23ca248144477482a38b02f63b259759a1 Mon Sep 17 00:00:00 2001 From: Xuc Pan Date: Sat, 5 Sep 2026 14:18:24 +0800 Subject: [PATCH] fix(release): run AUR publication as one owner Provision SSH credentials for the unprivileged builder and run clone, metadata generation, commit, and push under that same account. --- .github/workflows/release.yml | 55 ++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b1ba36..4442ae9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,28 +135,35 @@ jobs: env: AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }} run: | - install -d -m0700 "$HOME/.ssh" - printf '%s\n' "$AUR_SSH_PRIVATE_KEY" > "$HOME/.ssh/aur" - chmod 0600 "$HOME/.ssh/aur" - ssh-keyscan -H aur.archlinux.org > "$HOME/.ssh/known_hosts" - chmod 0600 "$HOME/.ssh/known_hosts" - export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/aur -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=$HOME/.ssh/known_hosts" - git clone ssh://aur@aur.archlinux.org/uur.git aur - cp packaging/aur/PKGBUILD packaging/aur/uur.install aur/ - version="${RELEASE_TAG#v}" - sed -i "s/^pkgver=.*/pkgver=$version/" aur/PKGBUILD - source_url="https://github.com/${GITHUB_REPOSITORY}/archive/refs/tags/${RELEASE_TAG}.tar.gz" - digest="$(curl -fsSL "$source_url" | sha256sum | cut -d' ' -f1)" - sed -i "s/^sha256sums=.*/sha256sums=('$digest')/" aur/PKGBUILD useradd --create-home builder - chown -R builder:builder aur - runuser -u builder -- bash -lc 'cd "$1" && makepkg --printsrcinfo > .SRCINFO' _ "$PWD/aur" - git -C aur config user.name uur-release-bot - git -C aur config user.email actions@users.noreply.github.com - git -C aur add PKGBUILD uur.install .SRCINFO - if git -C aur diff --cached --quiet; then - echo "AUR metadata is already current" - exit 0 - fi - git -C aur commit -m "uur $version" - git -C aur push + install -d -o builder -g builder -m0700 /home/builder/.ssh + printf '%s\n' "$AUR_SSH_PRIVATE_KEY" > /home/builder/.ssh/aur + ssh-keyscan -H aur.archlinux.org > /home/builder/.ssh/known_hosts + chown builder:builder /home/builder/.ssh/aur /home/builder/.ssh/known_hosts + chmod 0600 /home/builder/.ssh/aur /home/builder/.ssh/known_hosts + git_ssh='ssh -i /home/builder/.ssh/aur -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/home/builder/.ssh/known_hosts' + runuser -u builder -- env \ + HOME=/home/builder \ + GIT_SSH_COMMAND="$git_ssh" \ + RELEASE_TAG="$RELEASE_TAG" \ + GITHUB_REPOSITORY="$GITHUB_REPOSITORY" \ + bash -lc ' + git clone ssh://aur@aur.archlinux.org/uur.git "$HOME/aur" + cp "$1/packaging/aur/PKGBUILD" "$1/packaging/aur/uur.install" "$HOME/aur/" + cd "$HOME/aur" + version="${RELEASE_TAG#v}" + sed -i "s/^pkgver=.*/pkgver=$version/" PKGBUILD + source_url="https://github.com/${GITHUB_REPOSITORY}/archive/refs/tags/${RELEASE_TAG}.tar.gz" + digest="$(curl -fsSL "$source_url" | sha256sum | cut -d" " -f1)" + sed -i "s/^sha256sums=.*/sha256sums=(\"$digest\")/" PKGBUILD + makepkg --printsrcinfo > .SRCINFO + git config user.name uur-release-bot + git config user.email actions@users.noreply.github.com + git add PKGBUILD uur.install .SRCINFO + if git diff --cached --quiet; then + echo "AUR metadata is already current" + exit 0 + fi + git commit -m "uur $version" + git push + ' _ "$GITHUB_WORKSPACE"