From 30a1f8deb32c3ef7f88168802aa1eeae9aca504b Mon Sep 17 00:00:00 2001 From: nesteroff561 Date: Sun, 1 Jun 2025 20:05:25 +0300 Subject: [PATCH] fixed path --- .forgejo/workflows/build-image-sway.yaml | 2 +- .gitlab-ci.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-image-sway.yaml b/.forgejo/workflows/build-image-sway.yaml index 9c126fd..6d19b5d 100644 --- a/.forgejo/workflows/build-image-sway.yaml +++ b/.forgejo/workflows/build-image-sway.yaml @@ -18,4 +18,4 @@ jobs: mkdir ${PWD}/output docker run --privileged --rm -i -v ${PWD}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop sway --release testing ssh -o StrictHostKeyChecking=no ${{ secrets.STORAGE_USER}}@${{ secrets.STORAGE_HOST }} -p ${{ secrets.STORAGE_PORT}} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/sway/* - scp -o StrictHostKeyChecking=no -o Port=${{ secrets.STORAGE_PORT }} -o IdentityFile=~/.ssh/id_rsa -p -B ${PWD}/output/amd64/* ${{ secrets.STORAGE_USER }}@${{ secrets.STORAGE_HOST }}:/media/iso/tile-os/testing/sway/ \ No newline at end of file + scp -o StrictHostKeyChecking=no -o Port=${{ secrets.STORAGE_PORT }} -o IdentityFile=~/.ssh/id_rsa -p -B ${PWD}/builds/amd64/* ${{ secrets.STORAGE_USER }}@${{ secrets.STORAGE_HOST }}:/media/iso/tile-os/testing/sway/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf9d885..de20ada 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ tileos-sway-amd64: - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa - chmod 400 ~/.ssh/id_rsa - rm -rf ${CI_PROJECT_DIR}/output/* + - mkdir ${CI_PROJECT_DIR}/output - 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=/builder/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/ @@ -45,6 +46,7 @@ tileos-river-amd64: - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa - chmod 400 ~/.ssh/id_rsa - rm -rf ${CI_PROJECT_DIR}/output/* + - mkdir ${CI_PROJECT_DIR}/output - 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=/builder/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/