Skip to content
Snippets Groups Projects
Commit 0a729f75 authored by Andrea Bönsch's avatar Andrea Bönsch
Browse files

Update .gitlab-ci.yml for wording gcc6.3.1

parent 007fafdf
No related branches found
No related tags found
3 merge requests!148feature/#480_Create_a_smaller_test _mesh_for_combustion_demo,!141WIP: Resolve "Copy standard assets to build folder and remove resource path",!85WIP: Feature/234 continuous delivery
......@@ -57,17 +57,17 @@ conan:linux:gcc5.3.1:
- build
expire_in: 1 week
conan:linux:gcc6.2.1:
conan:linux:gcc6.3.1:
stage: conan
tags:
- gcc6.2.1
- gcc6.3.1
- linux
script:
- mkdir build
- cd build
- export CC=gcc
- export CXX=g++
- conan install .. --build=missing -s compiler="gcc" -s compiler.version="6.2" -s compiler.libcxx="libstdc++11"
- conan install .. --build=missing -s compiler="gcc" -s compiler.version="6.3" -s compiler.libcxx="libstdc++11"
artifacts:
paths:
- build
......@@ -103,13 +103,13 @@ cmake:linux:gcc5.3.1:
- build
expire_in: 1 week
cmake:linux:gcc6.2.1:
cmake:linux:gcc6.3.1:
stage: cmake
tags:
- gcc6.2.1
- gcc6.3.1
- linux
dependencies:
- conan:linux:gcc6.2.1
- conan:linux:gcc6.3.1
script:
- cd build
- cmake .. -Dglm_DIR=/home/buildbot/vrsw/glm/glm-0.9.8.4/lib/cmake/glm
......@@ -148,13 +148,13 @@ build:linux:gcc5.3.1:
- build
expire_in: 1 week
build:linux:gcc6.2.1:
build:linux:gcc6.3.1:
stage: build
tags:
- gcc6.2.1
- gcc6.3.1
- linux
dependencies:
- cmake:linux:gcc6.2.1
- cmake:linux:gcc6.3.1
script:
- cd build
- make
......@@ -184,13 +184,13 @@ test:linux:gcc5.3.1:
- cd build
- make test
test:linux:gcc6.2.1:
test:linux:gcc6.3.1:
stage: test
tags:
- gcc6.2.1
- gcc6.3.1
- linux
dependencies:
- build:linux:gcc6.2.1
- build:linux:gcc6.3.1
script:
- cd build
- make test
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment