From b7a9a3b2db23990dc21dc701c38a6d640387f07d Mon Sep 17 00:00:00 2001 From: Marko Petric Date: Wed, 24 Aug 2016 13:43:41 +0000 Subject: [PATCH] Update CI --- .gitlab-ci.d/init_x86_64.sh | 6 +++--- .gitlab-ci.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/init_x86_64.sh b/.gitlab-ci.d/init_x86_64.sh index df06ce7e4..7ba0544f4 100644 --- a/.gitlab-ci.d/init_x86_64.sh +++ b/.gitlab-ci.d/init_x86_64.sh @@ -41,7 +41,7 @@ export PATH=${CMAKE_HOME}/bin:$PATH # Python #-------------------------------------------------------------------------------- -export PYTHONDIR=${CLICREPO}/software/Python/2.7.11/${BUILD_FLAVOUR} +export PYTHONDIR=${CLICREPO}/software/Python/2.7.12/${BUILD_FLAVOUR} export PATH=$PYTHONDIR/bin:$PATH export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH @@ -82,7 +82,7 @@ export G4SYSTEM="Linux-g++" # LCIO #-------------------------------------------------------------------------------- -export LCIO=${CLICREPO}/software/LCIO/2.7.1/${BUILD_FLAVOUR} +export LCIO=${CLICREPO}/software/LCIO/2.7.2/${BUILD_FLAVOUR} # export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH" export PATH="$LCIO/bin:$PATH" export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH" @@ -107,6 +107,6 @@ export PATH="$Ninja_HOME:$PATH" #-------------------------------------------------------------------------------- # DD4hep #-------------------------------------------------------------------------------- - +BUILD_FLAVOUR=x86_64-${OS}-gcc${GCC_VER}-dbg source /afs/cern.ch/eng/clic/software/DD4hep/${BUILD_FLAVOUR}/bin/thisdd4hep.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8ec019e5..a196699b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ slc6-gcc48: image: clicdp/slc6-base script: - export GCC_VERSION="4.8.5" - - export BUILD_TYPE="dbg" + - export BUILD_TYPE="opt" - source .gitlab-ci.d/init_x86_64.sh - mkdir build - cd build @@ -24,7 +24,7 @@ slc6-gcc49: image: clicdp/slc6-base script: - export GCC_VERSION="4.9.3" - - export BUILD_TYPE="dbg" + - export BUILD_TYPE="opt" - source .gitlab-ci.d/init_x86_64.sh - mkdir build - cd build @@ -44,7 +44,7 @@ centos7-gcc49: image: clicdp/cc7-base script: - export GCC_VERSION="4.9.3" - - export BUILD_TYPE="dbg" + - export BUILD_TYPE="opt" - source .gitlab-ci.d/init_x86_64.sh - mkdir build - cd build