From 31fbe61d0b9381fbd0335f48137adc3ed82a50bf Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 19 Feb 2018 17:51:10 +0100
Subject: [PATCH] [CMake] Introduced variable IS_CI which is defined on
Jenkins.
Always update Conan packages on Jenkins.
---
Tests/CMakeLists.txt | 2 +-
scripts/cmake/CMakeSetup.cmake | 5 +++++
scripts/cmake/ConanSetup.cmake | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a623a41f84a..d3b242552b9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -77,7 +77,7 @@ if(OGS_USE_PCH)
endif()
# Add make-target tests which runs the testrunner
-if(DEFINED ENV{CI})
+if(IS_CI)
set(TESTRUNNER_ADDITIONAL_ARGUMENTS ${TESTRUNNER_ADDITIONAL_ARGUMENTS}
--gtest_shuffle --gtest_repeat=3)
endif()
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 21bce01043a..2a652145b0c 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -28,3 +28,8 @@ endif()
# Get the hostname
site_name(HOSTNAME)
+
+# Check if we are running under CI
+if(DEFINED ENV{JENKINS_URL} OR DEFINED ENV{CI})
+ set(IS_CI ON CACHE INTERNAL "")
+endif()
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index d1dcdcb9bca..bcc3a822fba 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -115,7 +115,7 @@ file(TIMESTAMP ${PROJECT_BINARY_DIR}/conan_install_timestamp.txt file_timestamp
string(TIMESTAMP timestamp "%Y.%m.%d")
# Run conan install update only once a day
-if("${file_timestamp}" VERSION_LESS ${timestamp})
+if("${file_timestamp}" VERSION_LESS ${timestamp} OR IS_CI)
file(WRITE ${PROJECT_BINARY_DIR}/conan_install_timestamp.txt "${timestamp}\n")
set(CONAN_UPDATE UPDATE)
else()
--
GitLab