From 1fdbb7809f6983eeeb9cde212fb8e92bd4c8a34e Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 12 Feb 2025 14:06:45 +0330 Subject: [PATCH 01/23] with checkout --- .forgejo/workflows/build.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 779ec4e..576cfd0 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -11,8 +11,11 @@ jobs: env: Desktop: "template" steps: - # - name: Checkout code - # uses: actions/checkout@v4 + - name: Install Node.js + run: pacman -Sy --noconfirm nodejs npm git + + - name: Checkout code + uses: actions/checkout@v4 - name: Build ISO run: | From 86b4815ee62fcec51fc719edd811301f05402d8a Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 12 Feb 2025 14:09:26 +0330 Subject: [PATCH 02/23] build.sh fix --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } From f670739aaf1ec3a1e5c4c3da856008356b738c8b Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 12 Feb 2025 14:13:06 +0330 Subject: [PATCH 03/23] added options: --privileged --- .forgejo/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 576cfd0..6c1eae1 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -8,6 +8,7 @@ jobs: runs-on: docker container: image: archlinux/archlinux:base-devel + options: --privileged env: Desktop: "template" steps: @@ -40,6 +41,7 @@ jobs: needs: [build_iso] container: image: archlinux/archlinux:base-devel + options: --privileged env: Desktop: "template" SSH_HOST: ${{ secrets.SSHHOST }} From 5f7ff3484d5571064d6e5720548bcad8d7a9f016 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 12 Feb 2025 14:19:18 +0330 Subject: [PATCH 04/23] added options: --privileged --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6c1eae1..e7e947e 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -13,14 +13,14 @@ jobs: Desktop: "template" steps: - name: Install Node.js - run: pacman -Sy --noconfirm nodejs npm git + run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 - 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" From 898f8778e9e86533c8f1287e44565381968f21f2 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 12 Feb 2025 14:34:26 +0330 Subject: [PATCH 05/23] trying ubuntu latest --- .forgejo/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index e7e947e..1dba945 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -5,15 +5,15 @@ on: jobs: build_iso: - runs-on: docker + runs-on: ubuntu-latest container: image: archlinux/archlinux:base-devel options: --privileged env: Desktop: "template" steps: - - name: Install Node.js - run: pacman -Sy --noconfirm nodejs npm git sudo + # - name: Install Node.js + # run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 From 50249bf5a5903d83f461cfab3858b71ad2f38f90 Mon Sep 17 00:00:00 2001 From: hikari Date: Wed, 12 Feb 2025 19:06:55 -0500 Subject: [PATCH 06/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 1dba945..8be8c70 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -17,7 +17,8 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - + - name: update + run: pacman -Syyuu - name: Build ISO run: | sudo ./build.sh From 7b1f0814d2eb5c6e1143fd46283b3e09c2ae7463 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 19:43:09 -0500 Subject: [PATCH 07/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 8be8c70..57568a8 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -12,8 +12,8 @@ jobs: env: Desktop: "template" steps: - # - name: Install Node.js - # run: pacman -Sy --noconfirm nodejs npm git sudo + - name: Install Node.js + run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 From 1816897f25ebc9273442977e25cfebc3d6396325 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 19:45:48 -0500 Subject: [PATCH 08/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 57568a8..f828962 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -12,8 +12,8 @@ jobs: env: Desktop: "template" steps: - - name: Install Node.js - run: pacman -Sy --noconfirm nodejs npm git sudo + #- name: Install Node.js + # run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 From f569ac8a041df61b8c1726ef8607a51c0fb854ad Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Wed, 12 Feb 2025 19:47:45 -0500 Subject: [PATCH 09/23] test --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index f828962..9270c1d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -12,8 +12,8 @@ jobs: env: Desktop: "template" steps: - #- name: Install Node.js - # run: pacman -Sy --noconfirm nodejs npm git sudo + - name: Install Node.js + run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 From 3b123c8d55d3da0c3facdfeb6cf1db8954a6f000 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 19:49:03 -0500 Subject: [PATCH 10/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 9270c1d..5262792 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -14,7 +14,6 @@ jobs: steps: - name: Install Node.js run: pacman -Sy --noconfirm nodejs npm git sudo - - name: Checkout code uses: actions/checkout@v4 - name: update From 7e297d77ddd8c5273a7945c88238012b48d01439 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 19:50:42 -0500 Subject: [PATCH 11/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 5262792..3e12ca6 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -17,7 +17,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: update - run: pacman -Syyuu + run: pacman -Syyuu --noconfirm - name: Build ISO run: | sudo ./build.sh From 084bc42c9ea68e4ba69c68842b0e34ee8a1e8ab3 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 20:00:12 -0500 Subject: [PATCH 12/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 3e12ca6..586d6ca 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -18,6 +18,8 @@ jobs: uses: actions/checkout@v4 - name: update run: pacman -Syyuu --noconfirm + - name: whoami + run: whoami - name: Build ISO run: | sudo ./build.sh From f5fcba5b8ee8f62d68ec35bb52ef306b4e8b61c5 Mon Sep 17 00:00:00 2001 From: hikari Date: Wed, 12 Feb 2025 20:19:22 -0500 Subject: [PATCH 13/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 586d6ca..a99d2cd 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -8,7 +8,8 @@ jobs: runs-on: ubuntu-latest container: image: archlinux/archlinux:base-devel - options: --privileged + privileged: true + env: Desktop: "template" steps: From eaf37afc972cf17a4f37e1ec581665d0e109fe30 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 21:09:02 -0500 Subject: [PATCH 14/23] Update iso/packages.x86_64 --- iso/packages.x86_64 | 1 - 1 file changed, 1 deletion(-) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index a19f435..9eb99da 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -94,7 +94,6 @@ python-psutil python-systemd refind #reflector -reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo From e20e0c3a8995b707d3bb638a46ef321be7172a25 Mon Sep 17 00:00:00 2001 From: sohrab Date: Wed, 12 Feb 2025 21:16:05 -0500 Subject: [PATCH 15/23] Update iso/packages.x86_64 --- iso/packages.x86_64 | 1 - 1 file changed, 1 deletion(-) diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 9eb99da..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 From a480a113f928f9de37d7f926df638094a57c3c44 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Thu, 13 Feb 2025 17:53:40 +0330 Subject: [PATCH 16/23] ReTry --- .forgejo/workflows/build.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a99d2cd..9a233a3 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -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 @@ -65,7 +40,6 @@ jobs: else echo "REMOTE_DIR=/srv/http/${{ env.Desktop }}/" >> $GITHUB_ENV fi - - name: Deploy files env: SSHPASS: ${{ secrets.SSHPASS }} From 8cf386b53e60837bbe5498ea0e814e6c59e309ff Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Thu, 13 Feb 2025 18:29:08 +0330 Subject: [PATCH 17/23] ReTry --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 9a233a3..7f038d0 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -44,5 +44,5 @@ jobs: env: SSHPASS: ${{ secrets.SSHPASS }} 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 -e ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "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.SSHHOST }}:${{ env.REMOTE_DIR }} From fd5fba6be512ed384ac1803b5ee403d2fb9f1a9c Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Thu, 13 Feb 2025 19:10:01 +0330 Subject: [PATCH 18/23] ReTry --- .forgejo/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 7f038d0..0b21439 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -41,8 +41,6 @@ jobs: echo "REMOTE_DIR=/srv/http/${{ env.Desktop }}/" >> $GITHUB_ENV fi - name: Deploy files - env: - SSHPASS: ${{ secrets.SSHPASS }} run: | sshpass -e ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "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.SSHHOST }}:${{ env.REMOTE_DIR }} From 107e43139c9794eedec9b4c55fefb9222e5e1886 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Thu, 13 Feb 2025 19:43:17 +0330 Subject: [PATCH 19/23] fixed env --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 0b21439..6b2875b 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -42,5 +42,5 @@ jobs: fi - name: Deploy files run: | - sshpass -e ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "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.SSHHOST }}:${{ env.REMOTE_DIR }} + sshpass -p ${{ env.SSHPASS }} ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" + sshpass -p ${{ env.SSHPASS }} rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ env.SSHHOST }}:${{ env.REMOTE_DIR }} From 74e4abfbea602763b182ac65aedcdc1535461302 Mon Sep 17 00:00:00 2001 From: sohrab Date: Thu, 13 Feb 2025 13:09:13 -0500 Subject: [PATCH 20/23] trying to fix added " " --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6b2875b..d16f8f9 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -42,5 +42,5 @@ jobs: fi - name: Deploy files run: | - sshpass -p ${{ env.SSHPASS }} ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" - sshpass -p ${{ env.SSHPASS }} rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ env.SSHHOST }}:${{ env.REMOTE_DIR }} + sshpass -p "${{ env.SSHPASS }}" ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" + sshpass -p "${{ env.SSHPASS }}" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ env.SSHHOST }}:${{ env.REMOTE_DIR }} From a7ba10f01f57153d53aca8d1a82b1d041b746dbb Mon Sep 17 00:00:00 2001 From: hikari Date: Sun, 16 Feb 2025 09:58:10 -0500 Subject: [PATCH 21/23] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index d16f8f9..3d03ddf 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -8,8 +8,8 @@ jobs: runs-on: ubuntu-latest container: image: archlinux/archlinux:base-devel - privileged: true - + permissions: + contents: read env: Desktop: "template" steps: @@ -42,5 +42,5 @@ jobs: fi - name: Deploy files run: | - sshpass -p "${{ env.SSHPASS }}" ssh -o StrictHostKeyChecking=no parch@${{ env.SSHHOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" - sshpass -p "${{ env.SSHPASS }}" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ env.SSHHOST }}:${{ env.REMOTE_DIR }} + sshpass -p "${{ secrets.SSHPASS }}" ssh -o StrictHostKeyChecking=no parch@${{ secrets.SSHHOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" + sshpass -p "${{ secrets.SSHPASS }}" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ secrets.SSHHOST }}:${{ env.REMOTE_DIR }} From b5aac1d777d9d2c1a3a75978585597b61bab8400 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Sun, 16 Feb 2025 23:00:35 +0330 Subject: [PATCH 22/23] Trying to fix the workflow --- .forgejo/workflows/build.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 3d03ddf..9ea9de5 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -8,8 +8,8 @@ jobs: runs-on: ubuntu-latest container: image: archlinux/archlinux:base-devel - permissions: - contents: read + privileged: true + env: Desktop: "template" steps: @@ -17,7 +17,7 @@ jobs: run: pacman -Sy --noconfirm nodejs npm git sudo - name: Checkout code uses: actions/checkout@v4 - - name: update + - name: update run: pacman -Syyuu --noconfirm - name: whoami run: whoami @@ -40,7 +40,12 @@ jobs: else echo "REMOTE_DIR=/srv/http/${{ env.Desktop }}/" >> $GITHUB_ENV fi + - name: Deploy files + env: + SSHPASS: ${{ secrets.SSHPASS }} + SSHHOST: ${{ secrets.SSHHOST }} run: | - sshpass -p "${{ secrets.SSHPASS }}" ssh -o StrictHostKeyChecking=no parch@${{ secrets.SSHHOST }} "rm -rf ${{ env.REMOTE_DIR }} && mkdir -p ${{ env.REMOTE_DIR }}" - sshpass -p "${{ secrets.SSHPASS }}" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@${{ secrets.SSHHOST }}:${{ env.REMOTE_DIR }} + sshpass -p "$SSHPASS" ssh -o StrictHostKeyChecking=no parch@$SSHHOST "rm -rf $REMOTE_DIR && mkdir -p $REMOTE_DIR" + sshpass -p "$SSHPASS" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@$SSHHOST:$REMOTE_DIR + From 241d00e2d2df8906a0a8e02803f67a027fd4df8a Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Sun, 16 Feb 2025 23:38:38 +0330 Subject: [PATCH 23/23] Trying to fix the workflow --- .forgejo/workflows/build.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 9ea9de5..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: | @@ -43,9 +43,8 @@ jobs: - name: Deploy files env: - SSHPASS: ${{ secrets.SSHPASS }} - SSHHOST: ${{ secrets.SSHHOST }} + PASS: ${{ secrets.PASS }} + HOST: ${{ secrets.HOST }} run: | - sshpass -p "$SSHPASS" ssh -o StrictHostKeyChecking=no parch@$SSHHOST "rm -rf $REMOTE_DIR && mkdir -p $REMOTE_DIR" - sshpass -p "$SSHPASS" rsync -avz out/ParchLinux-${{ env.Desktop }}-latest.iso out/md5sum.txt parch@$SSHHOST:$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