Merge branch '5-update-image' into 'master'

Resolve "Update image"

Closes #5

See merge request Electronics/eedb!3
This commit is contained in:
Bartosz Wieczorek 2019-01-04 15:12:02 +01:00
commit e4b595c0be
2 changed files with 8 additions and 5 deletions

View File

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

View File

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