From 96d26c8ec77698413283bee132d32fd30a2614ac Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Tue, 15 Mar 2016 09:18:23 +0000
Subject: [PATCH] Changes to YML
---
.gitlab-ci.yml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c2099259..668edc4cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,6 @@
before_script:
#pre-installation script
- - yum install make -y
- - yum install which -y
- - yum install glibc-devel -y
+ - yum install make glibc-devel -y
slc6-gcc48:
tags:
@@ -12,8 +10,8 @@ slc6-gcc48:
- source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
- mkdir build
- cd build
- - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D CLHEP_DIR=$CLHEP -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.1.2 ..
- - make -j4
+ - 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.2 ..
+ - make
- make install
@@ -25,6 +23,6 @@ slc6-gcc49:
- source .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
- mkdir build
- cd build
- - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D CLHEP_DIR=$CLHEP -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.1.2 ..
- - make -j4
+ - 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.2 ..
+ - make
- make install
--
GitLab