fix artcraftHEADmain

1 files changed, 26 insertions, 12 deletions

diff --git a/.forgejo/workflows/artcraft-update.yml b/.forgejo/workflows/artcraft-update.yml
index a7a0ba2..4be1e35 100644
--- a/.forgejo/workflows/artcraft-update.yml
+++ b/.forgejo/workflows/artcraft-update.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   update:
-    runs-on: iso-builder
+    runs-on: artcraft-builder
 
     steps:
       - name: Checkout PKGBUILDs repo
@@ -18,9 +18,22 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.FORGEJO_TOKEN }}
 
+      - name: Install VPS SSH key
+        env:
+          VPS_SSH_KEY: ${{ secrets.VPS_SSH_KEY }}
+        run: |
+          set -euo pipefail
+          if [ -z "${VPS_SSH_KEY:-}" ]; then
+            echo "HIBA: hianyzik a VPS_SSH_KEY secret"
+            exit 1
+          fi
+          install -d -m 700 "$HOME/.ssh"
+          (umask 077 && printf '%s\n' "$VPS_SSH_KEY" | tr -d '\r' > "$HOME/.ssh/vps_backup_key")
+
       - name: Install build tools
         run: |
           set -euo pipefail
+          sudo pacman -Sy --needed --noconfirm archlinux-keyring
           sudo pacman -Syu --noconfirm || { sleep 15; sudo pacman -Syu --noconfirm; } || { sleep 15; sudo pacman -Syu --noconfirm; }
           sudo pacman -S --needed --noconfirm base-devel git pacman-contrib rsync curl jq cargo
 
@@ -91,7 +104,7 @@ jobs:
           rm -rf /tmp/raveos-core-repo
           mkdir -p /tmp/raveos-core-repo/x86_64
           rsync -az -e "$RSYNC_SSH" \
-            root@10.66.66.1:/root/docker/repo/repo/x86_64/ /tmp/raveos-core-repo/x86_64/
+            root@185.170.114.175:/root/docker/repo/repo/x86_64/ /tmp/raveos-core-repo/x86_64/
           mkdir -p /tmp/builtpkgs
 
       - name: Import GPG signing key
@@ -171,6 +184,9 @@ jobs:
             echo "Nincs uj csomag -> kihagyva"
             exit 0
           fi
+          RSYNC_SSH="ssh -p 2222 -i $HOME/.ssh/vps_backup_key -o StrictHostKeyChecking=accept-new -o BatchMode=yes"
+          rsync -az --delete -e "$RSYNC_SSH" \
+            root@185.170.114.175:/root/docker/repo/repo/x86_64/ "$CORE/"
           for pkg in $BUILT; do
             PKGNAME=$(bsdtar -xOf "$pkg" .PKGINFO | awk -F' = ' '/^pkgname =/{print $2; exit}')
             if [[ ! "$PKGNAME" =~ ^[a-zA-Z0-9_+-]+$ ]]; then
@@ -179,7 +195,12 @@ jobs:
             fi
             rm -f "$CORE/${PKGNAME}-"[0-9]*.pkg.tar.zst* 2>/dev/null || true
             cp -v "$pkg" "$CORE/"
-            [ -f "$pkg.sig" ] && cp -v "$pkg.sig" "$CORE/"
+            if [ -f "$pkg.sig" ]; then
+              cp -v "$pkg.sig" "$CORE/"
+            else
+              echo "HIBA: hianyzik az alairas: $pkg.sig"
+              exit 1
+            fi
           done
           export GNUPGHOME=/tmp/raveos-gnupg
           cd "$CORE"
@@ -198,18 +219,10 @@ jobs:
           ln -sf raveos-core-repo.db.tar.xz.sig raveos-core-repo.db.sig
           ln -sf raveos-core-repo.files.tar.xz.sig raveos-core-repo.files.sig
           rm -f raveos-core-repo.db.tar.gz* raveos-core-repo.files.tar.gz* 2>/dev/null || true
-          RSYNC_SSH="ssh -p 2222 -i $HOME/.ssh/vps_backup_key -o StrictHostKeyChecking=accept-new -o BatchMode=yes"
           rsync -az --delete -e "$RSYNC_SSH" \
-            "$CORE/" root@10.66.66.1:/root/docker/repo/repo/x86_64/
+            "$CORE/" root@185.170.114.175:/root/docker/repo/repo/x86_64/
           echo "::notice title=Published packages::ArtCraft csomagok publikálva"
 
-      - name: Mirror raveos-core-repo to GitHub Releases
-        env:
-          GH_MIRROR_TOKEN: ${{ secrets.GH_MIRROR_TOKEN }}
-        run: |
-          set -euo pipefail
-          bash .forgejo/scripts/mirror-core-repo.sh /tmp/raveos-core-repo
-
       - name: Report failed builds
         if: steps.build.outputs.failed != ''
         run: |
@@ -219,6 +232,7 @@ jobs:
       - name: Cleanup
         if: always()
         run: |
+          rm -f "$HOME/.ssh/vps_backup_key"
           gpgconf --homedir /tmp/raveos-gnupg --kill gpg-agent || true
           sudo rm -rf /tmp/raveos-gnupg || true
           sudo rm -rf /tmp/builtpkgs || true