From 7081220f0a8a2fd43120b86ef0cea6c9e7c5105d Mon Sep 17 00:00:00 2001 From: Tim Kleinschmidt Date: Thu, 11 Jun 2026 08:32:26 +0200 Subject: [PATCH] ci: switch to upstream 2m/arch-pkgbuild-builder The fork (Azd325/arch-pkgbuild-builder) was created to work around the old upstream's aurpublish assumption that the package directory must be named after the package (our dir is gitkraken-aur/, package is gitkraken). Upstream solved this differently: pkgname is now the path to the build directory and the real package name is read from .SRCINFO. So the fork is no longer needed. Drop the custom builddir input and point pkgname at the directory; pin to upstream v1.21 by SHA. Verified in a container: pkgname resolves to 'gitkraken' from .SRCINFO and the empty-validpgpkeys gpg step exits cleanly under set -e. --- .github/workflows/validate-package.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validate-package.yml b/.github/workflows/validate-package.yml index ba08dab..7d2b634 100644 --- a/.github/workflows/validate-package.yml +++ b/.github/workflows/validate-package.yml @@ -22,19 +22,17 @@ jobs: - name: Validate PKGBUILD id: validate-pkgbuild - uses: Azd325/arch-pkgbuild-builder@1df308b1218f91dd79a496b7dae1383b3bcb2d14 + uses: 2m/arch-pkgbuild-builder@1e857b7a8cd3e37b29898833363bab7e621cdd7b # v1.21 with: target: "pkgbuild" - builddir: "gitkraken-aur" - pkgname: "gitkraken" + pkgname: "gitkraken-aur" - name: Validate SRCINFO id: validate-srcinfo - uses: Azd325/arch-pkgbuild-builder@1df308b1218f91dd79a496b7dae1383b3bcb2d14 + uses: 2m/arch-pkgbuild-builder@1e857b7a8cd3e37b29898833363bab7e621cdd7b # v1.21 with: target: "srcinfo" - builddir: "gitkraken-aur" - pkgname: "gitkraken" + pkgname: "gitkraken-aur" sources: name: Verify ${{ matrix.arch }} source runs-on: ubuntu-latest