diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 779ec4e..bb6790d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -5,48 +5,31 @@ on: jobs: build_iso: - runs-on: docker + runs-on: ubuntu-latest container: image: archlinux/archlinux:base-devel + privileged: true + env: Desktop: "template" steps: - # - name: Checkout code - # uses: actions/checkout@v4 - + - name: Install Node.js + run: pacman -Sy --noconfirm nodejs npm git sudo + - name: Checkout code + uses: actions/checkout@v4 + - name: Update system + run: pacman -Syyuu --noconfirm + - name: Check user + run: whoami - name: Build ISO run: | - ./build.sh + sudo ./build.sh echo "Renaming the output ISO file" mv out/*.iso out/ParchLinux-${{ env.Desktop }}-latest.iso echo "Generating MD5 checksum" 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 - 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 @@ -60,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 diff --git a/build.sh b/build.sh index ae91d1f..b018801 100755 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ main() { install() { set -e pacman -Sy; pacman --noconfirm -S --needed git wget github-cli p7zip reflector rsync - wget https://git.parchlinux.com/repo/ppr/-/raw/main/x86_64/archiso-99-1-any.pkg.tar.zst + wget https://git.parchlinux.com/repos/ppr/raw/branch/main/x86_64/archiso-99-1-any.pkg.tar.zst sudo pacman -U archiso-99-1-any.pkg.tar.zst --noconfirm } diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index a19f435..fcba12b 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -31,7 +31,6 @@ f2fs-tools fatresize fsarchiver git -gnu-netcat gpart gpm gptfdisk @@ -94,7 +93,6 @@ python-psutil python-systemd refind #reflector -reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo