diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index a623a41f84a9257935080993c8276f3dbf2ffb5a..d3b242552b9afa1e7f8cd4dca9cd9f99047bc015 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 21bce01043a814e496b5060ae5e70d25947b663e..2a652145b0c93ede039450b66bd84592cffeabd2 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 d1dcdcb9bcaeb5dd844fc0c61bb5665b122b1037..bcc3a822fbab2f188484f52c9b0eb93c35cefe0b 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()