From 75297b11e61042342701152a0718b7070004718b Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 29 Oct 2019 16:15:54 +0100 Subject: [PATCH] Changed the .gitlab-ci.yml structure Beginned with new building system .gitlab-ci.yml can now be generated by the script assemble-gitlab-ci.py. Therefore the .gitlab-ci.yml configuration file can be split into several smaller files --- .gitlab-ci.yml | 34 +++++++++++++++++----------------- CI/gitlab-ci/linux.yml | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fd21723..79a414a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: cppcheck: stage: build script: "CI/ci-cppcheck.sh" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -33,20 +33,20 @@ cppcheck: gcc-c++11-test-debug: stage: test script: "CI/ci-linux-test.sh gcc C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++11-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++11-build-debug: stage: build script: "CI/ci-linux-build.sh gcc C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -55,7 +55,7 @@ gcc-c++11-build-debug: gcc-c++11-build-release: stage: build script: "CI/ci-linux-build.sh gcc C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -64,19 +64,19 @@ gcc-c++11-build-release: clang-c++11-test-debug: stage: test script: "CI/ci-linux-test.sh clang C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++11-test-release: stage: test script: "CI/ci-linux-test.sh clang C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++11-build-debug: stage: build script: "CI/ci-linux-build.sh clang C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -85,7 +85,7 @@ clang-c++11-build-debug: clang-c++11-build-release: stage: build script: "CI/ci-linux-build.sh clang C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -94,19 +94,19 @@ clang-c++11-build-release: gcc-c++14-test-debug: stage: test script: "CI/ci-linux-test.sh gcc C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++14-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++14-build-debug: stage: build script: "CI/ci-linux-build.sh gcc C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -115,7 +115,7 @@ gcc-c++14-build-debug: gcc-c++14-build-release: stage: build script: "CI/ci-linux-build.sh gcc C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -124,19 +124,19 @@ gcc-c++14-build-release: clang-c++14-test-debug: stage: test script: "CI/ci-linux-test.sh clang C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++14-test-release: stage: test script: "CI/ci-linux-test.sh clang C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++14-build-debug: stage: build script: "CI/ci-linux-build.sh clang C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -145,7 +145,7 @@ clang-c++14-build-debug: clang-c++14-build-release: stage: build script: "CI/ci-linux-build.sh clang C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index 3073aa0e..a3480c64 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -5,7 +5,7 @@ cppcheck: stage: build script: "CI/ci-cppcheck.sh" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -14,20 +14,20 @@ cppcheck: gcc-c++11-test-debug: stage: test script: "CI/ci-linux-test.sh gcc C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++11-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++11-build-debug: stage: build script: "CI/ci-linux-build.sh gcc C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -36,7 +36,7 @@ gcc-c++11-build-debug: gcc-c++11-build-release: stage: build script: "CI/ci-linux-build.sh gcc C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -45,19 +45,19 @@ gcc-c++11-build-release: clang-c++11-test-debug: stage: test script: "CI/ci-linux-test.sh clang C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++11-test-release: stage: test script: "CI/ci-linux-test.sh clang C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++11-build-debug: stage: build script: "CI/ci-linux-build.sh clang C++11 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -66,7 +66,7 @@ clang-c++11-build-debug: clang-c++11-build-release: stage: build script: "CI/ci-linux-build.sh clang C++11 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -75,19 +75,19 @@ clang-c++11-build-release: gcc-c++14-test-debug: stage: test script: "CI/ci-linux-test.sh gcc C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++14-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] gcc-c++14-build-debug: stage: build script: "CI/ci-linux-build.sh gcc C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -96,7 +96,7 @@ gcc-c++14-build-debug: gcc-c++14-build-release: stage: build script: "CI/ci-linux-build.sh gcc C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -105,19 +105,19 @@ gcc-c++14-build-release: clang-c++14-test-debug: stage: test script: "CI/ci-linux-test.sh clang C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++14-test-release: stage: test script: "CI/ci-linux-test.sh clang C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] clang-c++14-build-debug: stage: build script: "CI/ci-linux-build.sh clang C++14 debug" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: @@ -126,7 +126,7 @@ clang-c++14-build-debug: clang-c++14-build-release: stage: build script: "CI/ci-linux-build.sh clang C++14 release" - image: graphics.rwth-aachen.de:4567/moebius/docker/docker-openmesh-container + image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] artifacts: paths: -- GitLab