Skip to content

ci: switch back to upstream 2m/arch-pkgbuild-builder#307

Merged
Azd325 merged 1 commit into
masterfrom
chore/arch-pkgbuild-builder-upstream
Jun 11, 2026
Merged

ci: switch back to upstream 2m/arch-pkgbuild-builder#307
Azd325 merged 1 commit into
masterfrom
chore/arch-pkgbuild-builder-upstream

Conversation

@Azd325

@Azd325 Azd325 commented Jun 11, 2026

Copy link
Copy Markdown
Owner

Retires the Azd325/arch-pkgbuild-builder fork in favor of upstream 2m/arch-pkgbuild-builder (pinned to v1.21 by SHA).

Why

The fork was created to work around the old upstream's aurpublish assumption that the package directory must be named after the package — our directory is gitkraken-aur/ but the package is gitkraken. Upstream has since solved this differently: pkgname is now the path to the build directory, and the real package name is read from .SRCINFO. The fork is no longer needed.

The fork is 14 commits ahead, 83 behind upstream and was last touched in 2023; upstream is actively maintained with proper version tags.

Changes

  • Both validation steps use 2m/arch-pkgbuild-builder@1e857b7 (v1.21).
  • Dropped the fork-only builddir input; pkgname now points at the gitkraken-aur directory.

Verification (in an Arch container)

  • pkgname resolves to gitkraken read from .SRCINFO, despite the gitkraken-aur/ directory name
  • ✅ The empty-validpgpkeys gpg step exits cleanly under set -e (so the pkgbuild target does not break)

Notes

  • No arm64 gain — upstream still uses an amd64-only image, same as the fork.
  • After merge, the Azd325/arch-pkgbuild-builder fork can be archived.
  • Touches the same workflow file as Add aarch64 support (#305) #306; whichever merges second may need a trivial rebase.

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.
@Azd325
Azd325 force-pushed the chore/arch-pkgbuild-builder-upstream branch from 0a65fe2 to 7081220 Compare June 11, 2026 06:37
@Azd325
Azd325 merged commit 0ab93ba into master Jun 11, 2026
18 checks passed
@Azd325
Azd325 deleted the chore/arch-pkgbuild-builder-upstream branch June 11, 2026 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant