diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ba1bfa..e60fbc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,17 +5,17 @@ stages: image: archlinux/archlinux:base-devel variables: - Desktop: "cosmic" + Desktop: "gnome" build_iso: stage: build script: - ./build.sh - echo "Renaming the output ISO file" - - mv out/*.iso out/ParchLinux-cosmic-latest.iso + - mv out/*.iso out/ParchLinux-$Desktop-latest.iso artifacts: paths: - - out/ParchLinux-cosmic-latest.iso + - out/ParchLinux-$Desktop-latest.iso rules: - if: $CI_COMMIT_TAG @@ -27,10 +27,10 @@ deploy_iso: - echo "Installing sshpass and rsync" - pacman -Syu --noconfirm sshpass rsync - echo "Removing old ISO files from remote directory" - - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf /srv/http/cosmic/ + - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf /srv/http/$Desktop/ - echo "Creating new directory on remote host" - - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/cosmic/ + - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/$Desktop/ - echo "Uploading new ISO via rsync" - - sshpass -p "$PASS" rsync -r out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/ + - sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso parch@$SSH_ROOT:/srv/http/$Desktop/ rules: - if: $CI_COMMIT_TAG