Skip to content

GitLab

Commit 8f672979 authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'master' into SmartRanges

parents 2237321c 05349d51
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 2 deletions
.gitlab-ci.yml
View file @ 8f672979
......@@ -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
......
CI/gitlab-ci/linux.yml
View file @ 8f672979
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment