fix runner tag
This commit is contained in:
parent
2d65487028
commit
592d1d96ac
2 changed files with 9 additions and 7 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1,4 +1,6 @@
|
||||||
tmp/*
|
tmp/*
|
||||||
builds/*
|
builds/*
|
||||||
artifacts/*
|
artifacts/*
|
||||||
.gitlab-ci.yml
|
#.gitlab-ci.yml
|
||||||
|
.forgejo
|
||||||
|
.forgejo/workflows
|
||||||
|
|
|
@ -5,7 +5,7 @@ stages:
|
||||||
prebuild:
|
prebuild:
|
||||||
stage: prebuild
|
stage: prebuild
|
||||||
tags:
|
tags:
|
||||||
- iso-builder
|
- Builder-1
|
||||||
script:
|
script:
|
||||||
- docker build --no-cache -f Dockerfile-builder -t builder:latest .
|
- docker build --no-cache -f Dockerfile-builder -t builder:latest .
|
||||||
tileos-sway-amd64:
|
tileos-sway-amd64:
|
||||||
|
@ -14,7 +14,7 @@ tileos-sway-amd64:
|
||||||
variables:
|
variables:
|
||||||
DESKTOP: sway
|
DESKTOP: sway
|
||||||
tags:
|
tags:
|
||||||
- iso-builder
|
- Builder-1
|
||||||
script:
|
script:
|
||||||
- eval $(ssh-agent -s)
|
- eval $(ssh-agent -s)
|
||||||
- mkdir ~/.ssh/
|
- mkdir ~/.ssh/
|
||||||
|
@ -23,7 +23,7 @@ tileos-sway-amd64:
|
||||||
- chmod 644 ~/.ssh/config
|
- chmod 644 ~/.ssh/config
|
||||||
- chmod 400 ~/.ssh/id_rsa
|
- chmod 400 ~/.ssh/id_rsa
|
||||||
- docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc -e DESKTOP=sway builder:latest ./build --desktop sway --release testing
|
- docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc -e DESKTOP=sway builder:latest ./build --desktop sway --release testing
|
||||||
- ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/testing/sway/*
|
- ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/ci/sway/*
|
||||||
- scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/sway/
|
- scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/sway/
|
||||||
tileos-river-amd64:
|
tileos-river-amd64:
|
||||||
when: manual
|
when: manual
|
||||||
|
@ -31,7 +31,7 @@ tileos-river-amd64:
|
||||||
variables:
|
variables:
|
||||||
DESKTOP: sway
|
DESKTOP: sway
|
||||||
tags:
|
tags:
|
||||||
- iso-builder
|
- Builder-1
|
||||||
script:
|
script:
|
||||||
- eval $(ssh-agent -s)
|
- eval $(ssh-agent -s)
|
||||||
- mkdir ~/.ssh/
|
- mkdir ~/.ssh/
|
||||||
|
@ -40,13 +40,13 @@ tileos-river-amd64:
|
||||||
- chmod 644 ~/.ssh/config
|
- chmod 644 ~/.ssh/config
|
||||||
- chmod 400 ~/.ssh/id_rsa
|
- 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
|
- 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 tileos@tileos rm -rf /media/iso/tile-os/testing/river/*
|
- ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/ci/river/*
|
||||||
- scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/
|
- scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/
|
||||||
mrproper:
|
mrproper:
|
||||||
stage: postbuild
|
stage: postbuild
|
||||||
when: on_success
|
when: on_success
|
||||||
tags:
|
tags:
|
||||||
- iso-builder
|
- Builder-1
|
||||||
needs:
|
needs:
|
||||||
- tileos-sway-amd64
|
- tileos-sway-amd64
|
||||||
- tileos-river-amd64
|
- tileos-river-amd64
|
||||||
|
|
Loading…
Add table
Reference in a new issue