From 94bb43cf465985ce947c8a15eb14b59f2feb339f Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Fri, 4 Jan 2019 15:12:02 +0100 Subject: [PATCH] Resolve "Update image" --- .gitlab-ci.yml | 9 ++++++--- cmake/install_deps.sh | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a3693a..6825e77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,9 +3,12 @@ stages: Build: stage: build - image: rikorose/gcc-cmake:gcc-7 + image: $CI_REGISTRY/buildsystems/gcc7_x64 + tags: + - ccache script: - mkdir build -p; cd build - - cmake -DCMAKE_BUILD_TYPE=Release ../ - - cmake --build . -- -j14 + - cmake -GNinja -DCMAKE_BUILD_TYPE=Release ../ + - cmake --build . + - ccache -s diff --git a/cmake/install_deps.sh b/cmake/install_deps.sh index df83721..dc7c021 100755 --- a/cmake/install_deps.sh +++ b/cmake/install_deps.sh @@ -61,7 +61,7 @@ ${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" ../sqlpp11-connector-postgresql\ -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"\ -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"\ -DENABLE_TESTS=FALSE -${CMAKE_COMMAND} --build . --target install -- -j$(nproc) +${CMAKE_COMMAND} --build . --target install cd ../ echo "building wt" @@ -111,7 +111,7 @@ ${CMAKE_COMMAND} -G"${CMAKE_GENERATOR}" \ -DENABLE_OPENGL=OFF\ -DENABLE_UNWIND=OFF\ -DCONNECTOR_FCGI=OFF -${CMAKE_COMMAND} --build . --target install -- -j$(nproc) +${CMAKE_COMMAND} --build . --target install cd ../ echo "building ChaiScript"