diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a9db6e68aa14cec36e5209fde2094bb900cb4b6..6d8c737df7a9931c269879629308d4f57960bae9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,10 @@ build_RAServices: image: ci_raservices:latest script: - PACKAGE=RAServices - - VARIANT=gnucxx11_opt - echo "Building $PACKAGE..." - mkdir install - - mkdir -p build/$VARIANT - - cd build/$VARIANT + - mkdir -p build/gnucxx11_opt + - cd build/gnucxx11_opt - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DCMAKE_INSTALL_PREFIX=/opt/lofar -DUSE_LOG4CPLUS=false ../.. - make - make DESTDIR=../../install install @@ -24,7 +23,7 @@ build_RAServices: artifacts: paths: - - build/$VARIANT + - build/gnucxx11_opt - install/*.ztar # build_CEP: @@ -211,9 +210,8 @@ test_RAServices: image: ci_raservices:latest script: - PACKAGE=RAServices - - VARIANT=gnucxx11_opt - echo "Testing $PACKAGE..." - - cd build/$VARIANT + - cd build/gnucxx11_opt - ctest dependencies: - build_RAServices @@ -221,7 +219,7 @@ test_RAServices: name: test-report when: always paths: - - build/$VARIANT/Testing/Temporary/LastTest.log + - build/gnucxx11_opt/Testing/Temporary/LastTest.log # test_CEP: # stage: test