diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a99d2cd..bb6790d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -17,9 +17,9 @@ jobs: run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 - - name: update + - name: Update system run: pacman -Syyuu --noconfirm - - name: whoami + - name: Check user run: whoami - name: Build ISO run: | @@ -30,31 +30,6 @@ jobs: md5sum out/ParchLinux-${{ env.Desktop }}-latest.iso > out/md5sum.txt echo "Build completed. Files generated:" ls -lh out/ - - - name: Upload artifacts - uses: actions/upload-artifact@v4 - with: - name: iso-artifacts - path: | - out/ParchLinux-${{ env.Desktop }}-latest.iso - out/md5sum.txt - - deploy_iso: - runs-on: docker - needs: [build_iso] - container: - image: archlinux/archlinux:base-devel - options: --privileged - env: - Desktop: "template" - SSH_HOST: ${{ secrets.SSHHOST }} - steps: - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - name: iso-artifacts - path: out/ - - name: Setup dependencies run: pacman -Syu --noconfirm sshpass rsync @@ -68,7 +43,8 @@ jobs: - name: Deploy files env: - SSHPASS: ${{ secrets.SSHPASS }} + PASS: ${{ secrets.PASS }} + HOST: ${{ secrets.HOST }} run: | - sshpass -e ssh -o StrictHostKeyChecking=no parch@${{ env.SSH_HOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" - sshpass -e rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ env.SSH_HOST }}:${{ env.REMOTE_DIR }} + sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$HOST "rm -rf $REMOTE_DIR && mkdir -p $REMOTE_DIR" + sshpass -p "$PASS" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@$HOST:$REMOTE_DIR