diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec36cf329342b27d551fa2553167600ea3959836..8c9a6a34dc6578a6420f9c9cc7d7fba53c4eb674 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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