Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into SmartRanges

Browse Source
This commit is contained in:
Max Lyon
2019-11-13 13:39:33 +01:00
parent 2237321c1c 05349d51e2
commit 8f672979a3
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@@ -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

9
CI/gitlab-ci/linux.yml
View File

@@ -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