Refactor: use archbuild action

.gitea/workflows/build.yml

@@ -3,50 +3,11 @@ on: [push]
 
 jobs:
   build-package:
-    runs-on: imgbuilder
-    container:
-      image: gitea.konchin.com/image/archmakepkg
-      credentials:
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_PASSWORD }}
-      options: --dns 172.20.10.253 --dns-search konchin.com --dns-option ndots:15
+    runs-on: pkgbuilder
     env:
-      REPO_NAME: custom
-      MINIO_BUCKET: archrepo
-      MINIO_ENDPOINT: https://minio.konchin.com
-      MINIO_ACCESSKEY: ${{ secrets.MINIO_ACCESSKEY }}
-      MINIO_SECRETKEY: ${{ secrets.MINIO_SECRETKEY }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build package
-        run: |
-          chown -R builder .
-          sudo -u builder makepkg -sc --needed --noconfirm
-      
-      - name: Setup MinIO
-        run: |
-          mcli alias set m "${{ env.MINIO_ENDPOINT }}" \
-            "${{ env.MINIO_ACCESSKEY }}" "${{ env.MINIO_SECRETKEY }}"
-          echo "Set endpoint to ${{ env.MINIO_ENDPOINT }}"
-          
-      - name: Copy repo db from MinIO
-        run: |
-          mkdir repo
-          mcli cp "m/${{ env.MINIO_BUCKET }}/${{ env.REPO_NAME }}.db" "repo/${{ env.REPO_NAME }}.db.tar.zst"
-          mcli cp "m/${{ env.MINIO_BUCKET }}/${{ env.REPO_NAME }}.files" "repo/${{ env.REPO_NAME }}.files.tar.zst"
-          echo "Copy ${{ env.REPO_NAME }}.db and ${{ env.REPO_NAME }}.files from MinIO"
-          
-      - name: Add pkgs to repo db
-        run: |
-          repo-add "repo/${{ env.REPO_NAME }}.db.tar.zst" *.pkg.tar.zst
-          mv *.pkg.tar.zst repo
-          echo "Add $(ls *.pkg.tar.zst) to repo"
-
-      - name: Update repo to MinIO
-        run: |
-          mcli mv repo/${{ env.REPO_NAME }}.db.tar.zst "m/${{ env.MINIO_BUCKET }}/${{ env.REPO_NAME }}.db"
-          mcli mv repo/${{ env.REPO_NAME }}.files.tar.zst "m/${{ env.MINIO_BUCKET }}/${{ env.REPO_NAME }}.files"
-          mcli mv repo/*.pkg.tar.zst "m/${{ env.MINIO_BUCKET }}"
-          echo "Update ${{ env.REPO_NAME }}.db adn ${{ env.REPO_NAME }}.files to MinIO"
+      - name: Build and push package
+        uses: https://gitea.konchin.com/action/archbuild@main
+        with:
+          minio-accesskey: ${{ secrets.MINIO_ACCESSKEY }}
+          minio-secretkey: ${{ secrets.MINIO_SECRETKEY }}

PKGBUILD

@@ -1,22 +1,33 @@
+# Maintainer: John Lane <archlinux at jelmail dot com>
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
 arch=('any')
 url="https://github.com/open-iscsi/targetcli-fb"
-license=('Apache')
+license=('Apache-2.0')
 groups=()
-depends=('python-rtslib-fb' 'python-configshell-fb'
-         'python-dbus' 'python-gobject')
-makedepends=(python-build python-installer python-wheel)
+depends=(
+  'python'
+  'python-rtslib-fb'
+  'python-configshell-fb'
+  'python-gobject'
+)
+makedepends=(
+  'python-build'
+  'python-hatch-vcs'
+  'python-hatchling'
+  'python-installer'
+  'python-wheel'
+)
 optdepends=()
 provides=('targetcli')
 backup=()
 options=()
 install=
-source=(https://github.com/open-iscsi/targetcli-fb/archive/v${pkgver}.tar.gz)
-sha512sums=('b9a0dac75d979df7639b88f755194c41ea2156af7ebfa43aae27186ebe5e46ca7d9e24782c53da9d8915ca0772a7ba089dd725ce8c7cf05b1c0a85b7cd1fc929')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/open-iscsi/${pkgname}/archive/v${pkgver}.tar.gz)
+sha512sums=('e4ed5b1911ba8858fcf8fe39580462b7b645672f836b195fba0549fb5f9532bf5223a7034bf92c14e5d01c106e388d8ec942cacac421dfd1271f9916ac47f4c0')
 
 
 build() {
@@ -29,6 +40,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   python -m installer --destdir="$pkgdir" dist/*.whl
 
+  install -d -m 750 "${pkgdir}/etc/target"
   install -D -m 644 targetcli.8.gz "$pkgdir/usr/share/man/man8/targetcli.8.gz"
   install -D -m 644 systemd/targetclid.service "$pkgdir/usr/lib/systemd/system/targetclid.service"
   install -D -m 644 systemd/targetclid.socket "$pkgdir/usr/lib/systemd/system/targetclid.socket"