diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d26d8c367d7d62c6f6050013f357053d25fc5f2..a128a49630404fc1deda5f61c0ec41debd3a0082 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ stages: before_script: - echo "Running global 'before_script'..." - yum -y -q -e 0 install tcl + - yum -y -q -e 0 install make - mkdir -p /scicore/soft/modules - ln -s /export/soft/apps/centos6/generic /scicore/soft/apps - ln -s /export/soft/modules/centos6/generic/all /scicore/soft/modules @@ -34,25 +35,23 @@ build:centos6.6: image: centos:6.6 script: - echo "Building on CentOS 6..." - - module list - cmake .. -DENABLE_MM=1 - -DOPEN_MM_LIBRARY=$EBROOTOPENMM/lib/libOpenMM.so - -DOPEN_MM_PLUGIN_DIR=$EBROOTOPENMM/lib/plugins - -DOPEN_MM_INCLUDE_DIR=$EBROOTOPENMM/include - -DCOMPILE_TMTOOLS=1 - -DENABLE_GFX=OFF - -DENABLE_GUI=OFF - -DUSE_NUMPY=1 - -DUSE_RPATH=1 - -DPYTHON_ROOT=$EBROOTPYTHON - -DEIGEN3_INCLUDE_DIR=$EBROOTEIGEN/include - -DFFTW_LIBRARY=$EBROOTFFTW/lib/libfftw3f.a - -DFFTW_INCLUDE_DIR=$EBROOTFFTW/include - -DBOOST_ROOT=$EBROOTBOOST - -DQT_QMAKE_EXECUTABLE=$EBROOTQT/bin/qmake - -DCOMPOUND_LIB=$COMP_LIB - -DOPTIMIZE=1 - - cat /etc/redhat-release + -DOPEN_MM_LIBRARY=$EBROOTOPENMM/lib/libOpenMM.so + -DOPEN_MM_PLUGIN_DIR=$EBROOTOPENMM/lib/plugins + -DOPEN_MM_INCLUDE_DIR=$EBROOTOPENMM/include + -DCOMPILE_TMTOOLS=1 + -DENABLE_GFX=OFF + -DENABLE_GUI=OFF + -DUSE_NUMPY=1 + -DUSE_RPATH=1 + -DPYTHON_ROOT=$EBROOTPYTHON + -DEIGEN3_INCLUDE_DIR=$EBROOTEIGEN/include + -DFFTW_LIBRARY=$EBROOTFFTW/lib/libfftw3f.a + -DFFTW_INCLUDE_DIR=$EBROOTFFTW/include + -DBOOST_ROOT=$EBROOTBOOST + -DQT_QMAKE_EXECUTABLE=$EBROOTQT/bin/qmake + -DCOMPOUND_LIB=$COMP_LIB + -DOPTIMIZE=1 - echo "... done building on CentOS 6." # TESTS STAGE