diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fea79ad9f4f522ab4d47778150b1a0c4f19a2e25..93c716ed9bc1c7507c5177c9de199c2ffc50da1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,16 +24,40 @@ before_script: - cmake -GNinja -DCMAKE_INSTALL_PREFIX=../dependencies-install ../GeoModelCore/ - cmake --build . --target install - cd ../GeoModelIO-build/ - - cmake -GNinja -DCMAKE_INSTALL_PREFIX=../dependencies-install -DCMAKE_PREFIX_PATH=../dependencies-install ../GeoModelIO/ + - cmake -GNinja -DCMAKE_INSTALL_PREFIX=../dependencies-install -DCMAKE_PREFIX_PATH=${PWD}/../dependencies-install ../GeoModelIO/ - cmake --build . --target install artifacts: paths: - dependencies-install/ -slc6_dependencies: +dependencies:slc6: <<: *dependencies_template image: cern/slc6-base:latest -centos7_dependencies: +dependencies:centos7: <<: *dependencies_template image: cern/cc7-base:latest + +# Build this project. +.build_template: &build_template + stage: build + tags: + - docker + - cvmfs + script: + - mkdir build + - cd build/ + - cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=${PWD}/../dependencies-install ../ + - cmake --build . + +build:slc6: + <<: *build_template + image: cern/slc6-base:latest + dependencies: + - dependencies:slc6 + +build:centos7: + <<: *build_template + image: cern/cc7-base:latest + dependencies: + - dependencies:centos7 diff --git a/CI/setup_lcg.sh b/CI/setup_lcg.sh index 161250a23a375ff0b1b07514876a35f79dfd3d67..cacad8fa7b5d0662eb9c947fbc46e927721b2c22 100644 --- a/CI/setup_lcg.sh +++ b/CI/setup_lcg.sh @@ -8,16 +8,16 @@ # determine os release if [ "$(cat /etc/redhat-release | grep 'Scientific Linux CERN SLC release 6')" ]; then os=slc6 - compiler=gcc62-opt + compiler=gcc8-opt elif [ "$(cat /etc/centos-release | grep 'CentOS Linux release 7')" ]; then os=centos7 - compiler=gcc7-opt + compiler=gcc9-opt else echo "Unknown OS" 1>&2 exit 1 fi -release=LCG_95 +release=LCG_96b platform=x86_64-${os}-${compiler} lcg=/cvmfs/sft.cern.ch/lcg/views/${release}/${platform}