diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64ac44c..ccc33c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ tileos-sway-amd64: tags: - Builder-1 script: + - rm -rf ${CI_PROJECT_DIR}/output/* - eval $(ssh-agent -s) - mkdir ~/.ssh/ - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa @@ -27,7 +28,7 @@ tileos-sway-amd64: - chmod 400 ~/.ssh/id_rsa - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop sway --release testing - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@${STORAGE_HOST} -p ${STORAGE_PORT} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/sway/* - - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/ + - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/ ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/ tileos-river-amd64: #rules: @@ -39,6 +40,7 @@ tileos-river-amd64: tags: - Builder-1 script: + - rm -rf ${CI_PROJECT_DIR}/output/* - eval $(ssh-agent -s) - mkdir ~/.ssh/ - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa @@ -47,7 +49,7 @@ tileos-river-amd64: - chmod 400 ~/.ssh/id_rsa - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop river --release testing - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@${STORAGE_HOST} -p ${STORAGE_PORT} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/river/* - - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/ + - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/ ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/ mrproper: #rules: