From ed876cedfe5837939af90ea5c1f5d0bf22f74d2c Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Tue, 6 Oct 2020 10:33:32 +0200
Subject: [PATCH] Update gitlab CI and config files.
---
.gitlab-ci.yml | 29 ++++++++++++-------
CMake/cmake_config_files/BILBO.config.cmake | 8 -----
CMake/cmake_config_files/ELLADAN.config.cmake | 7 +----
3 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d12cb41b..4d86c31b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,31 @@
-image: ubuntu
+image: irmb/virtualfluids-deps:latest
stages:
- build
+ - test
build:
stage: build
+ artifacts:
+ paths:
+ - build/
+
before_script:
- - export CAB_MACHINE=ELLADAN
- export DEBIAN_FRONTEND=noninteractive
- apt-get update
- - apt-get install build-essential -y
- - apt-get install cmake -y
- - apt-get install ninja-build -y
- - apt-get install openmpi-bin -y
- - apt-get install libomp-dev -y
- - apt-get install nvidia-cuda-dev nvidia-cuda-toolkit -y
script:
- - cmake -S . -B build -DBUILD_VF_CPU:BOOL=ON
- - cmake --build build --target VirtualFluidsCore
\ No newline at end of file
+ - cmake -S . -B build -DBUILD_VF_CPU:BOOL=ON -DBUILD_VF_UNIT_TESTS:BOOL=ON
+ - cmake --build build --target VirtualFluidsCore
+ - cmake --build build --target basicsTests
+
+
+test:
+ stage: test
+
+ before_script:
+ - export DEBIAN_FRONTEND=noninteractive
+
+ script:
+ - build/bin/basicsTests
\ No newline at end of file
diff --git a/CMake/cmake_config_files/BILBO.config.cmake b/CMake/cmake_config_files/BILBO.config.cmake
index 3c7f0f728..093fe3200 100644
--- a/CMake/cmake_config_files/BILBO.config.cmake
+++ b/CMake/cmake_config_files/BILBO.config.cmake
@@ -3,11 +3,3 @@
# Responsible: Soeren Peters
# OS: MacOS X
#################################################################################
-
-#################################################################################
-# METIS
-#################################################################################
-SET(METIS_INCLUDEDIR "/usr/local/include")
-SET(METIS_DEBUG_LIBRARY "/usr/local/lib/libmetis.a")
-SET(METIS_RELEASE_LIBRARY "/usr/local/lib/libmetis.a")
-
diff --git a/CMake/cmake_config_files/ELLADAN.config.cmake b/CMake/cmake_config_files/ELLADAN.config.cmake
index 80291455e..ff87d1b9d 100644
--- a/CMake/cmake_config_files/ELLADAN.config.cmake
+++ b/CMake/cmake_config_files/ELLADAN.config.cmake
@@ -5,10 +5,5 @@
#################################################################################
set(NVCUDASAMPLES_ROOT "~/cuda-samples/Common")
-#################################################################################
-# METIS
-#################################################################################
-set(METIS_INCLUDEDIR "/usr/include")
-set(METIS_DEBUG_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
-set(METIS_RELEASE_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
+
--
GitLab