From 09cd02784f0546083a05c5a78addf0b11dc541d8 Mon Sep 17 00:00:00 2001 From: hikari <94219809+metantesan@users.noreply.github.com> Date: Wed, 3 Jul 2024 20:46:37 +0330 Subject: [PATCH] Update build.yaml --- .github/workflows/build.yaml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7568152..102f159 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,11 +25,7 @@ jobs: - name: Install Packages via Pacman run: pacman -Sy; pacman --noconfirm -S git archiso python python-pygithub github-cli reflector p7zip openssh sshpass rsync wget - name: Build image - run: | - mkdir out - cd out - touch ParchLinux.gnome.beta.iso - # mkarchiso -v iso/ + run: mkarchiso -v iso/ - name: remove last iso run: sshpass -p "${{ secrets.SSH_PASS }}" ssh -o StrictHostKeyChecking=no root@$HOST rm -rf /srv/http/test/ - name: remove last iso @@ -37,7 +33,7 @@ jobs: - name: rename iso run: mv "$(ls out/*.iso)" out/Parchlinux-test-latest.iso - name: upload iso to host - run: sshpass -p "${{ secrets.SSH_PASS }}" rsync -r "out/$(ls out/*.iso)" root@mirror.parchlinux.com:/srv/http/test/ + run: sshpass -p "${{ secrets.SSH_PASS }}" rsync -r "$(ls out/*.iso)" root@mirror.parchlinux.com:/srv/http/test/ - name: Upload iso to the release run: | cd ./out @@ -48,7 +44,7 @@ jobs: md5sum iso_parts/* > iso_parts/md5sums.txt gh release upload ${{ github.event.release.tag_name }} ./iso_parts/* -R ${{ github.repository }} build: - if: github.event.release.prerelease == false + if: github.event.release.prerelease == true permissions: contents: write runs-on: ubuntu-latest @@ -58,19 +54,17 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install Packages via Pacman - run: pacman -Sy; pacman --noconfirm -S git archiso python python-pygithub github-cli reflector p7zip openssh sshpass rsync + run: pacman -Sy; pacman --noconfirm -S git archiso python python-pygithub github-cli reflector p7zip openssh sshpass rsync wget - name: Build image run: mkarchiso -v iso/ - - name: create .ssh folder - run: mkdir ~/.ssh - - name: generate ssh-key - run: ssh-keyscan -H {{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts - name: remove last iso - run: sshpass -p "{{ secrets.SSH_PASS }}" ssh root@{{ secrets.SSH_HOST }} bash -c "rm -rf /srv/http/test/*" + run: sshpass -p "${{ secrets.SSH_PASS }}" ssh -o StrictHostKeyChecking=no root@$HOST rm -rf /srv/http/test/ + - name: remove last iso + run: sshpass -p "${{ secrets.SSH_PASS }}" ssh -o StrictHostKeyChecking=no root@$HOST mkdir /srv/http/test/ - name: rename iso run: mv "$(ls out/*.iso)" out/Parchlinux-test-latest.iso - name: upload iso to host - run: sshpass -p "{{ secrets.SSH_PASS }}" rsync -r "out/$(ls out/*.iso)" root@{{ secrets.SSH_HOST }}:/srv/http/test + run: sshpass -p "${{ secrets.SSH_PASS }}" rsync -r "$(ls out/*.iso)" root@mirror.parchlinux.com:/srv/http/test/ - name: Upload iso to the release run: | cd ./out