From af6b27d2957187be23ea3beebbdeb38142bc4857 Mon Sep 17 00:00:00 2001 From: Gabriel Studer <gabriel.studer@unibas.ch> Date: Tue, 10 Jul 2018 14:44:32 +0200 Subject: [PATCH] use Qt5 in gitlab-ci --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88e3c289d..6fa4bfddd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ test:centos6.6: - module load numpy/1.9.1-goolf-1.4.10-Python-2.7.5 - module load Boost/1.53.0-goolf-1.4.10-Python-2.7.5 - module load OpenMM/6.1-Linux64 - - module load PyQt/4.11.4-goolf-1.4.10-Python-2.7.5 + - module load Qt5/5.9.3-goolf-1.7.20 - module load LibTIFF/4.0.3-goolf-1.4.10 - module load libpng/1.6.17-goolf-1.4.10 - module load zlib/1.2.8-goolf-1.4.10 @@ -58,7 +58,7 @@ test:centos6.6: -DFFTW_LIBRARY=$EBROOTFFTW/lib/libfftw3f.a -DFFTW_INCLUDE_DIR=$EBROOTFFTW/include -DBOOST_ROOT=$EBROOTBOOST - -DQT_QMAKE_EXECUTABLE=$EBROOTQT/bin/qmake + -DQT_QMAKE_EXECUTABLE=$EBROOTQT5/bin/qmake -DPNG_LIBRARY=$EBROOTLIBPNG/lib/libpng.so -DPNG_INCLUDE_DIR=$EBROOTLIBPNG/include -DPNG_PNG_INCLUDE_DIR=$EBROOTLIBPNG/include @@ -101,7 +101,7 @@ test:centos7.3: - module load Eigen/3.2.8-goolf-1.7.20 - module load numpy/1.10.1-goolf-1.7.20-Python-2.7.11 - module load Boost/1.53.0-goolf-1.7.20-Python-2.7.11 - - module load PyQt/4.11.4-goolf-1.7.20-Python-2.7.11 + - module load Qt5/5.9.3-goolf-1.7.20 - module load LibTIFF/.4.0.4-goolf-1.7.20 - module load Perl/5.22.2-goolf-1.7.20 - module load HH-suite/2.0.16-goolf-1.7.20-Boost-1.53.0-Python-2.7.11 @@ -126,7 +126,7 @@ test:centos7.3: -DFFTW_LIBRARY=$EBROOTFFTW/lib/libfftw3f.a -DFFTW_INCLUDE_DIR=$EBROOTFFTW/include -DBOOST_ROOT=$EBROOTBOOST - -DQT_QMAKE_EXECUTABLE=$EBROOTQT/bin/qmake + -DQT_QMAKE_EXECUTABLE=$EBROOTQT5/bin/qmake -DPNG_LIBRARY=$EBROOTLIBPNG/lib/libpng.so -DPNG_INCLUDE_DIR=$EBROOTLIBPNG/include -DPNG_PNG_INCLUDE_DIR=$EBROOTLIBPNG/include @@ -135,8 +135,8 @@ test:centos7.3: -DTIFF_INCLUDE_DIR=$EBROOTLIBTIFF/include -DTIFF_LIBRARY=$EBROOTLIBTIFF/lib/libtiff.so -DOPTIMIZE=1 - -DCMAKE_C_FLAGS='-L/scicore/soft/apps/LibTIFF/4.0.4-goolf-1.7.20/lib/ -L/scicore/soft/apps/libpng/1.6.18-goolf-1.7.20/lib/ -L/scicore/soft/apps/Boost/1.53.0-goolf-1.7.20-Python-2.7.11/lib/ -L/scicore/soft/apps/Qt/4.8.6-goolf-1.7.20/lib/ -Wno-unused-local-typedefs' - -DCMAKE_CXX_FLAGS='-L/scicore/soft/apps/LibTIFF/4.0.4-goolf-1.7.20/lib/ -L/scicore/soft/apps/libpng/1.6.18-goolf-1.7.20/lib/ -L/scicore/soft/apps/Boost/1.53.0-goolf-1.7.20-Python-2.7.11/lib/ -L/scicore/soft/apps/Qt/4.8.6-goolf-1.7.20/lib/ -Wno-unused-local-typedefs' + -DCMAKE_C_FLAGS='-L/scicore/soft/apps/LibTIFF/4.0.4-goolf-1.7.20/lib/ -L/scicore/soft/apps/libpng/1.6.18-goolf-1.7.20/lib/ -L/scicore/soft/apps/Boost/1.53.0-goolf-1.7.20-Python-2.7.11/lib/ -L/scicore/soft/apps/Qt5/5.9.3-goolf-1.7.20/lib/ -Wno-unused-local-typedefs' + -DCMAKE_CXX_FLAGS='-L/scicore/soft/apps/LibTIFF/4.0.4-goolf-1.7.20/lib/ -L/scicore/soft/apps/libpng/1.6.18-goolf-1.7.20/lib/ -L/scicore/soft/apps/Boost/1.53.0-goolf-1.7.20-Python-2.7.11/lib/ -L/scicore/soft/apps/Qt5/5.9.3-goolf-1.7.20/lib/ -Wno-unused-local-typedefs' - make -j 2 - echo " ... done building OST." - echo " Running unit tests for OST..." -- GitLab