From afa442f10d2be74c9910d4d74ebb0fb4a87a785c Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 11 Nov 2019 09:10:37 +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 | 9 ++++++++- CI/gitlab-ci/linux.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79a414a4..8c11993e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,13 +35,14 @@ gcc-c++11-test-debug: script: "CI/ci-linux-test.sh gcc C++11 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] - + dependencies: [gcc-c++11-build-debug] gcc-c++11-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++11 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [gcc-c++11-build-release] gcc-c++11-build-debug: stage: build @@ -66,12 +67,14 @@ clang-c++11-test-debug: script: "CI/ci-linux-test.sh clang C++11 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++11-build-debug] clang-c++11-test-release: stage: test script: "CI/ci-linux-test.sh clang C++11 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++11-build-release] clang-c++11-build-debug: stage: build @@ -96,12 +99,14 @@ gcc-c++14-test-debug: script: "CI/ci-linux-test.sh gcc C++14 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [gcc-c++14-build-debug] gcc-c++14-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++14 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [gcc-c++14-build-release] gcc-c++14-build-debug: stage: build @@ -126,12 +131,14 @@ clang-c++14-test-debug: script: "CI/ci-linux-test.sh clang C++14 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++14-build-debug] clang-c++14-test-release: stage: test script: "CI/ci-linux-test.sh clang C++14 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++14-build-release] clang-c++14-build-debug: stage: build diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index a3480c64..2255d739 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -16,13 +16,14 @@ gcc-c++11-test-debug: script: "CI/ci-linux-test.sh gcc C++11 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] - + dependencies: [gcc-c++11-build-debug] gcc-c++11-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++11 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [gcc-c++11-build-release] gcc-c++11-build-debug: stage: build @@ -47,12 +48,14 @@ clang-c++11-test-debug: script: "CI/ci-linux-test.sh clang C++11 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++11-build-debug] clang-c++11-test-release: stage: test script: "CI/ci-linux-test.sh clang C++11 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++11-build-release] clang-c++11-build-debug: stage: build @@ -77,12 +80,14 @@ gcc-c++14-test-debug: script: "CI/ci-linux-test.sh gcc C++14 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [gcc-c++14-build-debug] gcc-c++14-test-release: stage: test script: "CI/ci-linux-test.sh gcc C++14 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [gcc-c++14-build-release] gcc-c++14-build-debug: stage: build @@ -107,12 +112,14 @@ clang-c++14-test-debug: script: "CI/ci-linux-test.sh clang C++14 debug" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++14-build-debug] clang-c++14-test-release: stage: test script: "CI/ci-linux-test.sh clang C++14 release" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] + dependencies: [clang-c++14-build-release] clang-c++14-build-debug: stage: build