From 73bc58f55fd5cd505391f789be751b9266a666d5 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 26 Jun 2020 14:28:25 +0200
Subject: [PATCH] [ci] Do not run ctests on gui builds.
---
.gitlab-ci.yml | 2 ++
scripts/ci/extends/template-build-linux.yml | 6 +++---
scripts/ci/extends/template-build-win.yml | 6 +++---
scripts/ci/jobs/build-gui-linux.yml | 1 +
scripts/ci/jobs/build-gui-mac.yml | 1 +
scripts/ci/jobs/build-gui-win.yml | 1 +
6 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 077bfcde8b1..eb1763a1da8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,8 @@ variables:
# Build config
BUILD_TYPE: Release
BUILD_PROCESSES: "" # Empty string: builds all processes
+ BUILD_TESTS: "true"
+ BUILD_CTEST: "true"
include:
- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 4a23bc435cb..995cb4b4369 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -23,9 +23,9 @@
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
- $BUILD_CMD_PREFIX cmake --build . > >(tee make.output)
- - $BUILD_CMD_PREFIX cmake --build . --target tests
- - $BUILD_CMD_PREFIX cmake --build . --target ctest
- - cp Testing/**/Test.xml Tests/ctest.xml
+ - if $BUILD_TESTS ; then $BUILD_CMD_PREFIX cmake --build . --target tests ; fi
+ - if $BUILD_CTEST ; then $BUILD_CMD_PREFIX cmake --build . --target ctest ; fi
+ - if $BUILD_CTEST ; then cp Testing/**/Test.xml Tests/ctest.xml ; fi
cache:
paths:
diff --git a/scripts/ci/extends/template-build-win.yml b/scripts/ci/extends/template-build-win.yml
index 82d1a3e80b2..35e5837d93d 100644
--- a/scripts/ci/extends/template-build-win.yml
+++ b/scripts/ci/extends/template-build-win.yml
@@ -14,9 +14,9 @@
-DCMAKE_BUILD_TYPE="$env:BUILD_TYPE"
-DOGS_BUILD_PROCESSES="$env:BUILD_PROCESSES"
- cmake --build . --target package | Tee-Object -FilePath make.output
- - cmake --build . --target tests
- - cmake --build . --target ctest
- - cp Testing/**/Test.xml Tests/ctest.xml
+ - if($env:BUILD_TESTS -eq "true") { cmake --build . --target tests }
+ - if($env:BUILD_CTEST -eq "true") { cmake --build . --target ctest }
+ - if($env:BUILD_CTEST -eq "true") { cp Testing/**/Test.xml Tests/ctest.xml }
artifacts:
paths:
- $BUILD_DIR/Tests/ctest.xml
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index 62510ad890b..efc4b9e86ff 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -18,6 +18,7 @@ build gui linux:
allow_failure: true
variables:
BUILD_DIR: "build-gui-linux"
+ BUILD_CTEST: "false"
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
-DOGS_BUILD_GUI=ON
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index b0d8f49d9c8..d5f81bccdc8 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -16,6 +16,7 @@ build gui mac:
variables:
BUILD_DIR: "build-gui-mac"
+ BUILD_CTEST: "false"
CMAKE_ARGS: >-
-DOGS_USE_CONAN=OFF
-DOGS_USE_PCH=OFF
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index a902090127e..12d32cd0b09 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -14,6 +14,7 @@ build gui win:
variables:
BUILD_DIR: build-gui-win
+ BUILD_CTEST: "false"
CMAKE_ARGS: >-
-DOGS_USE_PYTHON=ON
-DOGS_BUILD_GUI=ON
--
GitLab