From 08f4cf6b405cf296d292b317323b0c11f8bf6f14 Mon Sep 17 00:00:00 2001 From: George Sedov <george.sedov@desy.de> Date: Mon, 14 Nov 2022 19:07:14 +0100 Subject: [PATCH] bash is weird --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98f1f81d5..9584a348c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,15 +25,15 @@ include: - PACKAGE_LOW=${PACKAGE_TYPE,,} - > if [ -z "$WITH_LIBFABRIC" ]; then - ENABLE_LIBFABRIC="ON" - else ENABLE_LIBFABRIC="OFF" + else + ENABLE_LIBFABRIC="ON" fi - > if [ -z "$WITH_PYTHON2" ]; then - BUILD_PYTHON2="ON" - else BUILD_PYTHON2="OFF" + else + BUILD_PYTHON2="ON" fi - cmake -DCMAKE_BUILD_TYPE="Release" -DENABLE_LIBFABRIC=$ENABLE_LIBFABRIC -DINSTALL_EXAMPLES=ON -DBUILD_CLIENTS_ONLY=ON -DPACKAGE_RELEASE_SUFFIX=$OS_SUFFIX -DBUILD_PYTHON=OFF -DCPACK_PACKAGE_NAME="asapo-devel" -DCPACK_GENERATOR=$PACKAGE_UP .. - make -j 4 @@ -62,6 +62,7 @@ include: - python_bin=$PYTHON_PATH/bin/python - pip_bin=$PYTHON_PATH/bin/pip - $pip_bin install cython numpy==$NUMPY_VERSION + - mkdir $CI_PROJECT_DIR/build - cd $CI_PROJECT_DIR/build - cmake -DENABLE_LIBFABRIC=ON -DCMAKE_BUILD_TYPE="Release" -DBUILD_CLIENTS_ONLY=ON -DPython_EXECUTABLE=$python_bin -DBUILD_PYTHON_PACKAGES=source -DBUILD_PYTHON2_PACKAGES=OFF -DNUMPY_VERSION=$NUMPY_VERSION .. - cd $CI_PROJECT_DIR/build/consumer/api/python/dist_linux -- GitLab