Refactor: use archbuild action

.gitea/workflows/build.yml

@@ -3,50 +3,11 @@ on: [push]
 
 jobs:
   build-package:
-    runs-on: imgbuilder
+    runs-on: pkgbuilder
-    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
     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
+      - name: Build and push package
-        uses: actions/checkout@v4
+        uses: https://gitea.konchin.com/action/archbuild@main
-
+        with:
-      - name: Build package
+          minio-accesskey: ${{ secrets.MINIO_ACCESSKEY }}
-        run: |
+          minio-secretkey: ${{ secrets.MINIO_SECRETKEY }}
-          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"

PKGBUILD

@@ -1,48 +1,46 @@
-# Maintainer: Rigo Reddig <rigo.reddig at gmail dot com>
+# Contributor: Johannes Dewender  arch at JonnyJD dot net
-pkgname='python-rtslib-fb'
+pkgname=python-rtslib-fb
 _pkgname=rtslib-fb
-pkgver=2.2.0
+pkgver=2.2.3
 pkgrel=1
-pkgdesc="Free branch version of the LIO target API"
+pkgdesc="free branch version of the LIO target API"
 arch=('any')
-url="https://github.com/open-iscsi/$_pkgname"
+url="https://github.com/open-iscsi/${_pkgname}"
 license=('Apache')
-depends=('python' 'python-six' 'python-pyudev')
+options=()
-conflicts=('python2-rtslib' 'targetcli-fb<=2.1.fb31')
+depends=('python' 'python-pyudev')
-makedepends=('python-setuptools' 'python-pyudev' 'python-build' 'python-hatch' 
+makedepends=('python' 'python-build' 'python-pip' 'python-pyudev')
-  'python-hatch-vcs' 'python-installer')
+provides=('python-rtslib')
-source=(
+conflicts=('python-rtslib')
-  "https://github.com/open-iscsi/$_pkgname/archive/v${pkgver}.tar.gz"
+source=("git+${url}.git#tag=v${pkgver}")
-  target.service
+sha512sums=('c3d249d2b965d155860fbf77b57b99cb5f78fd325ae38ba65fbecb7853cf03a48e983e16ba23e4e8c5f33fac8fd29d58b11e3305e563d380c632bc96f32b17a7')
-  fix_open_context.patch
-)
-sha512sums=('8a321be004fabdd4abb479a1900bc27103000ea15712cbcc855fdaa762dca1658e1f3528e1e1976a56a99e57a60c0d69e3bdede5323a2f1a3a6bf419a5ddc6d4'
-            '3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5'
-            '312e380deb60f082238389bcd455309283935d039e2d1404be25f12546ebaaf46d8e2d0dcaa05ecab4f97014c40dfb351ba082e07c6e8a2ee20004dd149d6431')
 
-prepare() {
+_pydep1() {
-    cd "$srcdir/$_pkgname-$pkgver"
+  if which python >/dev/null 2>&1; then
-    patch -Np1 -i "$srcdir/fix_open_context.patch"
+    python -c 'import sys; major, minor = sys.version.split(".")[:2]; print(f"python>={major}.{minor}")'
+  else
+    echo "python"
+  fi
+}
+
+_pydep2() {
+  if which python >/dev/null 2>&1; then
+    python -c 'import sys; major, minor = sys.version.split(".")[:2]; print(f"python<{major}.{int(minor)+1}")'
+  else
+    echo "python"
+  fi
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname"
-  SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver python -m build --wheel --no-isolation
+
+  python -m build
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  depends=("$(_pydep1)" "$(_pydep2)" "${depends[@]:1}")
-  python -m installer --destdir="$pkgdir" dist/*.whl
+  cd "$srcdir/$_pkgname"
-  install -Dm644 doc/targetctl.8 "$pkgdir/usr/share/man/man8/targetctl.8"
+  python -m pip install --no-deps --ignore-installed --root="$pkgdir/" dist/${_pkgname/-fb/_fb}-${pkgver}-py3-none-any.whl
-  install -Dm644 doc/saveconfig.json.5 "$pkgdir/usr/share/man/man5/saveconfig.json.5"
-
-  install -dm755 "$pkgdir/etc/target/backup"
-  install -Dm644 "$srcdir/target.service" "$pkgdir/usr/lib/systemd/system/target.service"
-
-  # Install targetctl script to /usr/bin
-  install -Dm755 scripts/targetctl "$pkgdir/usr/bin/targetctl"
-
-  # Create symlink for rtslib_fb to rtslib
-  #install -dm755 "$pkgdir/usr/lib/python3.13/site-packages/rtslib"
-  ln -s ./rtslib "$pkgdir/usr/lib/python3.13/site-packages/rtslib_fb"
 }
+
+# vim:set ts=2 sw=2 et: