From 900b637c467f3a3c23898f52dd80e920f7aab803 Mon Sep 17 00:00:00 2001
From: Luca Bilke <bilke@tralios.de>
Date: Wed, 3 Apr 2024 10:50:24 +0200
Subject: [PATCH] fix build process

---
 .forgejo/workflows/build.yml | 61 +++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 40c48b8..29eaf4b 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Build/Publish XBPS
 
 on: [push]
@@ -6,61 +7,57 @@ jobs:
   build-and-publish:
     runs-on: docker
     container: git.snaile.de/snailed/xbps-builder:2024.4.843
-    env:
-      LICENSE: GPL-2.0
-      SHORT_DESCRIPTION: Customized dwm
-      DEPENDENCIES: pango>=1.44,glibc>=2.32,libX11>=1.2,libXft>=2.3.8,libXinerama>=1.0.3,fontconfig>=2.6.0
-      MAINTAINER: Luca Bilke <luca@bil.ke>
-      ARCH: x86_64
-      NAME: dwm-custom
     steps:
       - name: Checkout
         uses: https://code.forgejo.org/actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           submodules: true
 
-      - name: Generate and package name
+      - name: Generate tag and package name
         run: |
+          set -xeu
           MAJOR=$(date +%Y)
           MINOR=$(date +%m | sed 's/^0//')
           PATCH=$(date +%H%M | sed 's/^0//')
-          echo "PACKAGE_NAME=${{ env.NAME }}-${MAJOR}.${MINOR}.${PATCH}_1" >> $GITHUB_ENV
+          echo "PACKAGE_NAME=${{ vars.NAME }}-${MAJOR}.${MINOR}.${PATCH}_1" >> $GITHUB_ENV
 
-      - name: Patch
+      - name: Build
         run: |
+          set -xeu
           cp -f config.mk patches.h dwm-flexipatch/
           bash flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
           for patch in patches/*.diff; do
             patch -d dwm-final <"$patch"
           done
-          cp -f config.h dwm-final/
-          cd dwm-final || exit 1
+          cp -f config.h dwm-final
+          cd dwm-final && make clean install DESTDIR="${GITHUB_WORKSPACE}/pkg" PREFIX="/usr"
 
-      - name: Build
-        run: make clean install DESTDIR="${GITHUB_WORKSPACE}/pkg" PREFIX="/usr"
-
-      - name: Prep signing directory
+      - name: Prep packaging directory
         run: |
+          set -xeu
+
+      - name: Create package
+        run : |
+          set -xeu
+          export XBPS_TARGET_ARCH=${{ vars.ARCH }}
           mkdir /target
-          curl -o "/target/${{ env.ARCH }}-repodata" "https://xbps.snaile.de/${{ env.ARCH }}-repodata"
-
-      - name: Package
-        run: |
-          export XBPS_TARGET_ARCH=${{ env.ARCH }}
-          xbps-create -A ${{ env.ARCH }} \
+          cd /target || exit 1
+          xbps-create -A ${{ vars.ARCH }} \
             -H "${{ github.server_url }}/${{ github.repository }}" \
-            -l "${{ env.LICENSE }}" \
+            -l "${{ vars.LICENSE }}" \
             -n "${{ env.PACKAGE_NAME }}" \
-            -m "${{ env.MAINTAINER }}" \
-            -s "${{ env.SHORT_DESCRIPTION }}" \
-            -D "${{ env.DEPENDENCIES }}" \
+            -m "${{ vars.MAINTAINER }}" \
+            -s "${{ vars.SHORT_DESCRIPTION }}" \
+            -D "${{ vars.DEPENDENCIES }}" \
             "${GITHUB_WORKSPACE}/pkg"
-            echo '${{ secret.XBPS_SIGNING_KEY }}' >~/.ssh/id_rsa
-            xbps-rindex -a /target/${{ env.PACKAGE_NAME }}.${{ env.ARCH }}.xbps
-            xbps-rindex -S --signedby "Luca Bilke <luca@bil.ke>" /target/${{ env.PACKAGE_NAME }}.${{ env.ARCH }}.xbps
 
       - name: Push Package
         run: |
-          for f in /target/*; do
-            curl --digest -u "Johnny5:${{ secret.XBPS_WEBDAV_KEY }}" -T "${f}" "https://xbps.snaile.de/dav/${f}"
-          done
+          set -xeu
+          curl -so "/target/${{ vars.ARCH }}-repodata" "https://xbps.snaile.de/${{ vars.ARCH }}-repodata"
+          xbps-rindex --add "/target/${{ env.PACKAGE_NAME }}.${{ vars.ARCH }}.xbps"
+          echo "${{ secrets.XBPS_SIGNING_KEY }}" >/tmp/privkey.pem
+          XBPS_PASSPHRASE=${{ secrets.XBPS_SIGNING_PASSPHRASE }} xbps-rindex --privkey /tmp/privkey.pem --sign-pkg --signedby "${{ vars.MAINTAINER }}" "/target/${{ env.PACKAGE_NAME }}.${{ vars.ARCH }}.xbps"
+          rm /tmp/privkey.pem
+          ls -lAH /target
+          find /target -type f -exec sh -c 'curl -X PUT --digest -u "${{ vars.XBPS_WEBDAV_USER }}:${{ secrets.XBPS_WEBDAV_KEY }}" -T "${1}" "https://xbps.snaile.de/dav/$(basename $1)"' find-shell {} \;