From d10254178ec884f99178f1ecefec243b58eea82c Mon Sep 17 00:00:00 2001
From: dedner <a.s.dedner@warwick.ac.uk>
Date: Wed, 1 Apr 2020 13:25:41 +0100
Subject: [PATCH] added init script to 'before_script' section
---
.gitlab-ci.yml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58b3300f..3c7a1965 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,13 @@
---
variables:
- # dune-python will use DUNE_OPTS when building stuff
- DUNE_CMAKE_FLAGS: "-DDUNE_ENABLE_PYTHONBINDINGS=ON -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
- DUNECI_CMAKE_FLAGS: $DUNE_CMAKE_FLAGS
- DUNECI_TOOLCHAIN: gcc-7-17
DUNE_CONTROL_PATH: /duneci/modules:$CI_PROJECT_DIR
DUNE_PY_DIR: /duneci/modules/dune-py
+ # adding this actually leads to the test failure seen in the core modules
+ # DUNECI_PARALLEL: 6 # don't know why this is required here but not for core modules - magic?
PYTHONPATH: "/duneci/modules/dune-common/build-cmake/python:/duneci/modules/dune-geometry/build-cmake/python:/duneci/modules/dune-grid/build-cmake/python:/duneci/modules/dune-istl/build-cmake/python:/duneci/modules/dune-alugrid/build-cmake/python:/duneci/modules/dune-fem/build-cmake/python:$CI_PROJECT_DIR/build-cmake/python"
before_script:
+ - . /duneci/bin/duneci-init-job
- python3 -m venv /duneci/modules/dune-pip
- source /duneci/modules/dune-pip/bin/activate
- pip install --upgrade pip
@@ -30,6 +29,8 @@ debian-11-gcc-9-17:
- duneci-standard-test
variables:
DUNECI_TOOLCHAIN: gcc-9-17
+ DUNE_CMAKE_FLAGS: "-DDUNE_ENABLE_PYTHONBINDINGS=ON -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
+ DUNECI_CMAKE_FLAGS: $DUNE_CMAKE_FLAGS
ubuntu:18.04--gcc:
image: duneci/ubuntu:18.04
@@ -38,3 +39,8 @@ ubuntu:18.04--gcc:
# issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
# - python /duneci/modules/dune-python/bin/setup-dunepy.py --opts=$CI_PROJECT_DIR/scripts/opts/ci-gcc.opts install
- duneci-standard-test
+ variables:
+ DUNECI_TOOLCHAIN: gcc-7-17
+ DUNE_CMAKE_FLAGS: "-DDUNE_ENABLE_PYTHONBINDINGS=ON -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
+ DUNECI_CMAKE_FLAGS: $DUNE_CMAKE_FLAGS
+
--
GitLab