Skip to content
Snippets Groups Projects
Commit 0de24962 authored by Auke Klazema's avatar Auke Klazema
Browse files

Merge branch 'SW-981' into 'LOFAR-Release-4_2' 

SW-981: Fix Release branch 4_2 build

See merge request !544
parents 363849e9 b21d4284
No related branches found
No related tags found
1 merge request!544SW-981: Fix Release branch 4_2 build
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 4 deletions
.gitlab-ci.yml
+ 5
− 4
View file @ 0de24962
...@@ -14,6 +14,7 @@ include: ...@@ -14,6 +14,7 @@ include:
variables: variables:
FASTLANE: "false" FASTLANE: "false"
VERSION: "0.0.0" VERSION: "0.0.0"
USE_PYTHON: "true"
set_version: set_version:
stage: .pre stage: .pre
...@@ -29,7 +30,7 @@ set_version: ...@@ -29,7 +30,7 @@ set_version:
- echo "Building $PACKAGE..." - echo "Building $PACKAGE..."
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES=$PACKAGE -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.16/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DCASACORE_ROOT_DIR=/opt/casacore/ -DCMAKE_INSTALL_PREFIX=/opt/lofar ../.. - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_PYTHON=$USE_PYTHON -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.16/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DCASACORE_ROOT_DIR=/opt/casacore/ -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
- make -j $(nproc) - make -j $(nproc)
- make DESTDIR=${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install install - make DESTDIR=${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install install
- cd ${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install/opt/lofar - cd ${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install/opt/lofar
...@@ -97,7 +98,7 @@ build_SCU: ...@@ -97,7 +98,7 @@ build_SCU:
- echo "Building SCU & TMSSFrontend..." - echo "Building SCU & TMSSFrontend..."
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES="SCU TMSSFrontend" -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../.. - cmake -DBUILD_PACKAGES="SCU TMSSFrontend" -DUSE_PYTHON=$USE_PYTHON -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../..
- make -j $(nproc) - make -j $(nproc)
- make install - make install
interruptible: true interruptible: true
...@@ -116,7 +117,7 @@ build_LTAIngest: ...@@ -116,7 +117,7 @@ build_LTAIngest:
- echo "Building $PACKAGE..." - echo "Building $PACKAGE..."
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES="$PACKAGE" -DUSE_LOG4CPLUS=false ../.. - cmake -DBUILD_PACKAGES="$PACKAGE" -DUSE_PYTHON=$USE_PYTHON -DUSE_LOG4CPLUS=false ../..
- make -j $(nproc) - make -j $(nproc)
- make install - make install
interruptible: true interruptible: true
...@@ -135,7 +136,7 @@ build_LTAIngestTransfer: ...@@ -135,7 +136,7 @@ build_LTAIngestTransfer:
- echo "Building $PACKAGE..." - echo "Building $PACKAGE..."
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES="$PACKAGE" -DUSE_LOG4CPLUS=false ../.. - cmake -DBUILD_PACKAGES="$PACKAGE" -DUSE_PYTHON=$USE_PYTHON -DUSE_LOG4CPLUS=false ../..
- make -j $(nproc) - make -j $(nproc)
- make install - make install
interruptible: true interruptible: true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment