From fd36b33d873d7ea61c110655f04f8b5016b5b2cf Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Mon, 20 Jun 2016 16:42:08 +0000
Subject: [PATCH] change CI dependencies
---
.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh | 96 -------------------
.gitlab-ci.d/init_x86_64-mac1011-clang70.sh | 69 -------------
.../init_x86_64-slc6-gcc48-opt-desy.sh | 95 ------------------
.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh | 93 ------------------
.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh | 93 ------------------
.gitlab-ci.d/test.sh | 3 -
.gitlab-ci.yml | 18 ++--
7 files changed, 12 insertions(+), 455 deletions(-)
delete mode 100644 .gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
delete mode 100644 .gitlab-ci.d/init_x86_64-mac1011-clang70.sh
delete mode 100644 .gitlab-ci.d/init_x86_64-slc6-gcc48-opt-desy.sh
delete mode 100644 .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
delete mode 100644 .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
delete mode 100644 .gitlab-ci.d/test.sh
diff --git a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
deleted file mode 100644
index c1873da5c..000000000
--- a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# General variables
-export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84
-
-#--------------------------------------------------------------------------------
-# GCC 4.9.3
-#--------------------------------------------------------------------------------
-
-source $LCGRELEASES/gcc/4.9.3/x86_64-centos7/setup.sh
-
-#--------------------------------------------------------------------------------
-# CMake 3.4.1
-#--------------------------------------------------------------------------------
-
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-centos7-gcc49-opt
-export PATH=${CMAKE_HOME}/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# Python 2.7.10
-#--------------------------------------------------------------------------------
-
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-centos7-gcc49-opt
-export PATH=$PYTHONDIR/bin:$PATH
-export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
-
-#--------------------------------------------------------------------------------
-# pytools 1.9
-#--------------------------------------------------------------------------------
-
-export PYTOOLSDIR=$LCGRELEASES/1.9_python2.7/x86_64-centos7-gcc49-opt
-export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
-export PATH=$PYTOOLSDIR/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# CLHEP
-#--------------------------------------------------------------------------------
-
-export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-centos7-gcc49-opt
-export CLHEP_BASE_DIR="$CLHEP"
-export CLHEP_INCLUDE_DIR="$CLHEP/include"
-export PATH="$CLHEP_BASE_DIR/bin:$PATH"
-export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-centos7-gcc49-opt
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# LCIO
-#--------------------------------------------------------------------------------
-
-export LCIO="/afs/cern.ch/eng/clic/software/lcio/v02-08/x86_64-centos7-gcc49-opt"
-export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
-export PATH="$LCIO/tools:$LCIO/bin:$PATH"
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-
-export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-centos7-gcc49-opt
-export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
-
-#--------------------------------------------------------------------------------
-# QT
-#--------------------------------------------------------------------------------
-
-export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-centos7-gcc49-opt
-export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-export PATH="$QTDIR/bin:$PATH"
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-centos7-gcc49-opt
-
-#--------------------------------------------------------------------------------
-# XercesC
-#--------------------------------------------------------------------------------
-
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-centos7-gcc49-opt
-export PATH="$XercesC_HOME/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
-
-
-# --- source GEANT4 INIT script ---
-test -r ${G4ENV_INIT} && { cd $(dirname ${G4ENV_INIT}) ; . ./$(basename ${G4ENV_INIT}) ; cd $OLDPWD ; }
diff --git a/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh b/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh
deleted file mode 100644
index d4f98eeef..000000000
--- a/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-# -------------------------------------------------------------------- ---
-
-# --- Use the same compiler and python as used for the installation ---
-
-# -------------------------------------------------------------------- ---
-export PATH=/usr/bin:/usr/bin:${PATH}
-export LD_LIBRARY_PATH=/usr/lib:/usr/lib64:/usr/lib:${LD_LIBRARY_PATH}
-
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-export ROOTSYS="/Users/gitlab-runner/CI/root_v6.06.02"
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-
-#--------------------------------------------------------------------------------
-# CLHEP
-#--------------------------------------------------------------------------------
-export CLHEP="/Users/gitlab-runner/CI/clhep-2.2.0.4"
-export CLHEP_BASE_DIR="$CLHEP"
-export CLHEP_INCLUDE_DIR="$CLHEP/include"
-export PATH="$CLHEP_BASE_DIR/bin:$PATH"
-export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# DD4hep
-#--------------------------------------------------------------------------------
-export DD4hepINSTALL=`pwd`
-export DD4HEP=`pwd`
-export PYTHONPATH="$DD4HEP/python:$DD4HEP/DDCore/python:$PYTHONPATH"
-export PATH="$DD4HEP/bin:$PATH"
-export LD_LIBRARY_PATH="$DD4HEP/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# LCIO
-#--------------------------------------------------------------------------------
-export LCIO="/Users/gitlab-runner/CI/lcio/HEAD"
-export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
-export PATH="$LCIO/tools:$LCIO/bin:$PATH"
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-export G4INSTALL="/Users/gitlab-runner/CI/geant4.10.01.p01"
-export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
-export G4SYSTEM="Darwin-g++"
-
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-export BOOST_ROOT="/Users/gitlab-runner/CI/boost_1.60"
-
-#--------------------------------------------------------------------------------
-# CMake
-#--------------------------------------------------------------------------------
-
-# --- source GEANT4 INIT script ---
-test -r ${G4ENV_INIT} && { cd $(dirname ${G4ENV_INIT}) ; . ./$(basename ${G4ENV_INIT}) ; cd $OLDPWD ; }
-
-# --- set DYLD_LIBRARY_PATH to LD_LIBRARY_PATH for MAC compatibility ---
-export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DYLD_LIBRARY_PATH
-
-
diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt-desy.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt-desy.sh
deleted file mode 100644
index 9afa705cd..000000000
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt-desy.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# General variables
-export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84
-
-#--------------------------------------------------------------------------------
-# GCC 4.8.4
-#--------------------------------------------------------------------------------
-
-source $LCGRELEASES/gcc/4.8.4/x86_64-slc6/setup.sh
-
-#--------------------------------------------------------------------------------
-# CMake 3.4.1
-#--------------------------------------------------------------------------------
-
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc48-opt
-export PATH=${CMAKE_HOME}/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# Python 2.7.10
-#--------------------------------------------------------------------------------
-
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc48-opt
-export PATH=$PYTHONDIR/bin:$PATH
-export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
-
-#--------------------------------------------------------------------------------
-# pytools 1.9
-#--------------------------------------------------------------------------------
-
-export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc48-opt
-export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
-export PATH=$PYTOOLSDIR/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# CLHEP
-#--------------------------------------------------------------------------------
-
-#export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc48-opt
-export CLHEP="/afs/desy.de/project/ilcsoft/sw/x86_64_gcc48_sl6/CLHEP/2.3.1.1/"
-export CLHEP_BASE_DIR="$CLHEP"
-export CLHEP_INCLUDE_DIR="$CLHEP/include"
-export PATH="$CLHEP_BASE_DIR/bin:$PATH"
-export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc48-opt
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# LCIO
-#--------------------------------------------------------------------------------
-export LCIO="/afs/cern.ch/eng/clic/software/lcio/v02-08/x86_64-slc6-gcc48-opt"
-export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
-export PATH="$LCIO/tools:$LCIO/bin:$PATH"
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-
-#export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-slc6-gcc48-opt
-export G4INSTALL="/afs/desy.de/project/ilcsoft/sw/x86_64_gcc48_sl6/geant4/10.02.p01/"
-export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
-
-#--------------------------------------------------------------------------------
-# QT
-#--------------------------------------------------------------------------------
-
-export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-slc6-gcc48-opt
-export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-export PATH="$QTDIR/bin:$PATH"
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc48-opt
-
-#--------------------------------------------------------------------------------
-# XercesC
-#--------------------------------------------------------------------------------
-
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc48-opt
-export PATH="$XercesC_HOME/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
-
-
diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
deleted file mode 100644
index e612bcb58..000000000
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-# General variables
-export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84
-
-#--------------------------------------------------------------------------------
-# GCC 4.8.4
-#--------------------------------------------------------------------------------
-
-source $LCGRELEASES/gcc/4.8.4/x86_64-slc6/setup.sh
-
-#--------------------------------------------------------------------------------
-# CMake 3.4.1
-#--------------------------------------------------------------------------------
-
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc48-opt
-export PATH=${CMAKE_HOME}/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# Python 2.7.10
-#--------------------------------------------------------------------------------
-
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc48-opt
-export PATH=$PYTHONDIR/bin:$PATH
-export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
-
-#--------------------------------------------------------------------------------
-# pytools 1.9
-#--------------------------------------------------------------------------------
-
-export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc48-opt
-export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
-export PATH=$PYTOOLSDIR/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# CLHEP
-#--------------------------------------------------------------------------------
-
-export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc48-opt
-export CLHEP_BASE_DIR="$CLHEP"
-export CLHEP_INCLUDE_DIR="$CLHEP/include"
-export PATH="$CLHEP_BASE_DIR/bin:$PATH"
-export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc48-opt
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# LCIO
-#--------------------------------------------------------------------------------
-export LCIO="/afs/cern.ch/eng/clic/software/lcio/v02-08/x86_64-slc6-gcc48-opt"
-export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
-export PATH="$LCIO/tools:$LCIO/bin:$PATH"
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-
-export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-slc6-gcc48-opt
-export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
-
-#--------------------------------------------------------------------------------
-# QT
-#--------------------------------------------------------------------------------
-
-export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-slc6-gcc48-opt
-export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-export PATH="$QTDIR/bin:$PATH"
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc48-opt
-
-#--------------------------------------------------------------------------------
-# XercesC
-#--------------------------------------------------------------------------------
-
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc48-opt
-export PATH="$XercesC_HOME/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
-
-
diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
deleted file mode 100644
index 0dfe42ed1..000000000
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-# General variables
-export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84
-
-#--------------------------------------------------------------------------------
-# GCC 4.9.3
-#--------------------------------------------------------------------------------
-
-source $LCGRELEASES/gcc/4.9.3/x86_64-slc6/setup.sh
-
-#--------------------------------------------------------------------------------
-# CMake 3.4.1
-#--------------------------------------------------------------------------------
-
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc49-opt
-export PATH=${CMAKE_HOME}/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# Python 2.7.10
-#--------------------------------------------------------------------------------
-
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc49-opt
-export PATH=$PYTHONDIR/bin:$PATH
-export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
-
-#--------------------------------------------------------------------------------
-# pytools 1.9
-#--------------------------------------------------------------------------------
-
-export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc49-opt
-export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
-export PATH=$PYTOOLSDIR/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# CLHEP
-#--------------------------------------------------------------------------------
-
-export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc49-opt
-export CLHEP_BASE_DIR="$CLHEP"
-export CLHEP_INCLUDE_DIR="$CLHEP/include"
-export PATH="$CLHEP_BASE_DIR/bin:$PATH"
-export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc49-opt
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# LCIO
-#--------------------------------------------------------------------------------
-
-export LCIO="/afs/cern.ch/eng/clic/software/lcio/v02-08/x86_64-slc6-gcc49-opt"
-export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
-export PATH="$LCIO/tools:$LCIO/bin:$PATH"
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-
-export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-slc6-gcc49-opt
-export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
-
-#--------------------------------------------------------------------------------
-# QT
-#--------------------------------------------------------------------------------
-
-export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-slc6-gcc49-opt
-export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-export PATH="$QTDIR/bin:$PATH"
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc49-opt
-
-#--------------------------------------------------------------------------------
-# XercesC
-#--------------------------------------------------------------------------------
-
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc49-opt
-export PATH="$XercesC_HOME/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
-
diff --git a/.gitlab-ci.d/test.sh b/.gitlab-ci.d/test.sh
deleted file mode 100644
index b38687aea..000000000
--- a/.gitlab-ci.d/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /cvmfs/sft.cern.ch/lcg/releases/LCG_84/ROOT/6.06.02/x86_64-slc6-gcc48-opt/bin
-. ./thisroot.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b16b4e44b..42a962d59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,12 @@ slc6-gcc48:
- docker
image: clicdp/slc6-base
script:
- - source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
+ - export GCC_VERSION="4.8.5"
+ - export BUILD_TYPE="opt"
+ - source .gitlab-ci.d/init_x86_64.sh
- mkdir build
- cd build
- - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX11=ON ..
+ - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.1.3 -D DD4HEP_USE_CXX11=ON ..
- make -j4
- make install
- . ../bin/thisdd4hep.sh
@@ -27,10 +29,12 @@ slc6-gcc49:
- docker
image: clicdp/slc6-base
script:
- - source .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
+ - export GCC_VERSION="4.9.3"
+ - export BUILD_TYPE="opt"
+ - source .gitlab-ci.d/init_x86_64.sh
- mkdir build
- cd build
- - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX14=ON ..
+ - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.1.3 -D DD4HEP_USE_CXX11=ON ..
- make -j3
- make install
- . ../bin/thisdd4hep.sh
@@ -51,10 +55,12 @@ centos7-gcc49:
- docker
image: clicdp/cc7-base
script:
- - source .gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
+ - export GCC_VERSION="4.9.3"
+ - export BUILD_TYPE="opt"
+ - source .gitlab-ci.d/init_x86_64.sh
- mkdir build
- cd build
- - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX14=ON ..
+ - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.1.3 -D DD4HEP_USE_CXX11=ON ..
- make -j3
- make install
- . ../bin/thisdd4hep.sh
--
GitLab