From 988cd605e48ce66df80b51b7c9eda38faabde40f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 29 Jan 2024 11:20:52 +0100
Subject: [PATCH] Update workflow

---
 .github/archlinux/.SRCINFO     |  1 +
 .github/archlinux/PKGBUILD     |  3 +--
 .github/workflows/arch-pkg.yml | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 .github/archlinux/.SRCINFO

diff --git a/.github/archlinux/.SRCINFO b/.github/archlinux/.SRCINFO
new file mode 100644
index 00000000..2c3ebc79
--- /dev/null
+++ b/.github/archlinux/.SRCINFO
@@ -0,0 +1 @@
+pkgname = prjtrellis-git
diff --git a/.github/archlinux/PKGBUILD b/.github/archlinux/PKGBUILD
index f94e14be..1277213a 100644
--- a/.github/archlinux/PKGBUILD
+++ b/.github/archlinux/PKGBUILD
@@ -3,7 +3,6 @@
 _prj=trellis
 _pkgname=prj$_prj
 pkgname=$_pkgname-git
-_commit=%COMMIT%
 pkgver=dummy
 pkgrel=1
 pkgdesc='Documentation and definitions for the Lattice ECP5 bit-stream format'
@@ -15,7 +14,7 @@ makedepends=('git' 'cmake' 'boost' 'python-sphinx' 'python-sphinx_rtd_theme' 'py
 optdepends=('python: Python support')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("git+$url.git#commit=$_commit")
+source=("git+$url.git")
 sha512sums=('SKIP')
 
 pkgver() {
diff --git a/.github/workflows/arch-pkg.yml b/.github/workflows/arch-pkg.yml
index 5a59594d..ca921be3 100644
--- a/.github/workflows/arch-pkg.yml
+++ b/.github/workflows/arch-pkg.yml
@@ -4,16 +4,12 @@ on: [push, pull_request]
 jobs:
   arch-pkg:
     runs-on: ubuntu-latest
-    container:
-      image: archlinux
-      options: --privileged
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build Arch Linux package
-        uses: FFY00/build-arch-package@v1
+        uses: 2m/arch-pkgbuild-builder@v1.21
         with:
-          PKGBUILD: $GITHUB_WORKSPACE/.github/archlinux/PKGBUILD
+          target: 'pkgbuild'
+          pkgname: '.github/archlinux'