aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2023-04-16 17:54:10 +0200
committerjaseg <git@jaseg.de>2023-04-16 17:54:10 +0200
commitac52ecdafc1ba95fbc8e32635cffebbe44c3dd1e (patch)
tree098a151c0ddb8e3555cdee36e42d75c6e5a4ff68 /.gitlab-ci.yml
parent5dbeb6800b38ff87a3315f639d8630404080d1a0 (diff)
downloadgerbolyze-ac52ecdafc1ba95fbc8e32635cffebbe44c3dd1e.tar.gz
gerbolyze-ac52ecdafc1ba95fbc8e32635cffebbe44c3dd1e.tar.bz2
gerbolyze-ac52ecdafc1ba95fbc8e32635cffebbe44c3dd1e.zip
Move CI to the new container names
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml28
1 files changed, 14 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3728fa2..65896fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,23 +72,23 @@ publish:gerbolyze:
# - svg-flatten/testcase-fails/*.png
# - svg-flatten/testcase-fails/*.svg
-build:svg-flatten-ubuntu_2204:
+build:svg-flatten-ubuntu_rolling:
stage: build
- image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:22.04"
+ image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:rolling"
script:
- "export CXX=clang++"
- "make -C svg-flatten"
artifacts:
- name: "gerbolyze-$CI_COMMIT_REF_NAME-svg-flatten-ubu22"
+ name: "gerbolyze-$CI_COMMIT_REF_NAME-svg-flatten-uburl"
paths:
- svg-flatten/build/svg-flatten
- svg-flatten/build/nopencv-test
-test:svg-flatten-ubuntu_2204:
+test:svg-flatten-ubuntu_rolling:
stage: test
variables:
GIT_SUBMODULE_STRATEGY: none
- image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:22.04"
+ image: "registry.gitlab.com/gerbolyze/build-containers/ubuntu:rolling"
script:
- git config --global --add safe.directory "$CI_PROJECT_DIR"
- "export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
@@ -98,31 +98,31 @@ test:svg-flatten-ubuntu_2204:
- "gerbolyze --help"
- "make -C svg-flatten tests"
dependencies:
- - build:svg-flatten-ubuntu_2204
+ - build:svg-flatten-ubuntu_rolling
artifacts:
- name: "gerbolyze-$CI_COMMIT_REF_NAME-test-ubu22"
+ name: "gerbolyze-$CI_COMMIT_REF_NAME-test-uburl"
when: on_failure
paths:
- svg-flatten/testcase-fails/*.png
- svg-flatten/testcase-fails/*.svg
-build:svg-flatten-fedora_36:
+build:svg-flatten-fedora_latest:
stage: build
- image: "registry.gitlab.com/gerbolyze/build-containers/fedora:36"
+ image: "registry.gitlab.com/gerbolyze/build-containers/fedora:latest"
script:
- "export CXX=clang++"
- "make -C svg-flatten"
artifacts:
- name: "gerbolyze-$CI_COMMIT_REF_NAME-svg-flatten-fed36"
+ name: "gerbolyze-$CI_COMMIT_REF_NAME-svg-flatten-fedlt"
paths:
- svg-flatten/build/svg-flatten
- svg-flatten/build/nopencv-test
-test:svg-flatten-fedora_36:
+test:svg-flatten-fedora_latest:
stage: test
variables:
GIT_SUBMODULE_STRATEGY: none
- image: "registry.gitlab.com/gerbolyze/build-containers/fedora:36"
+ image: "registry.gitlab.com/gerbolyze/build-containers/fedora:latest"
script:
- git config --global --add safe.directory "$CI_PROJECT_DIR"
- "export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
@@ -132,9 +132,9 @@ test:svg-flatten-fedora_36:
- "gerbolyze --help"
- "make -C svg-flatten tests"
dependencies:
- - build:svg-flatten-fedora_36
+ - build:svg-flatten-fedora_latest
artifacts:
- name: "gerbolyze-$CI_COMMIT_REF_NAME-test-fed36"
+ name: "gerbolyze-$CI_COMMIT_REF_NAME-test-fedlt"
when: on_failure
paths:
- svg-flatten/testcase-fails/*.png