Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Marko Petric committed Aug 24, 2016
1 parent 776ae2c commit b7a9a3b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .gitlab-ci.d/init_x86_64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand All @@ -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

6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b7a9a3b

Please sign in to comment.