From 0f19c725421d7ac8a6893221f57adce86f02f37d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 11 Jul 2023 13:21:09 +0200
Subject: [PATCH 1/2] [ci] cdash submit as a separate step (which is allowed to
 fail).

---
 CTestConfig.cmake                           | 1 +
 scripts/ci/extends/template-build-linux.yml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 254dbd91c6c..84d1df32658 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -3,6 +3,7 @@ set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
 set(CTEST_SUBMIT_URL
     "https://cdash.opengeosys.org/submit.php?project=${CTEST_PROJECT_NAME}"
 )
+set(CTEST_SUBMIT_INACTIVITY_TIMEOUT 30)
 if(DEFINED ENV{CI_JOB_NAME})
     # Bug in CDash: Remove ":", see
     # https://github.com/Kitware/CDash/issues/1292
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 7f76b349f7b..f2e35a1efdc 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -91,11 +91,12 @@
             echo "ctest arguments: ${ctest_arguments}"
             maybe_run_with_xvfb ctest \
                 -M Experimental --group "${ctest_group}" "${regex_argument}" \
-                --test-dir "${build_dir_full}" -T Start -T Test -T Submit \
+                --test-dir "${build_dir_full}" -T Start -T Test \
                 ${ctest_arguments} \
                 --output-junit Tests/ctest.xml \
                 --stop-time "`date -d "today + ${ctest_timeout} minutes" +'%H:%M:%S'`" \
                 --no-tests=error
+            ctest --test-dir "${build_dir_full}" -T Submit || true
           fi
         fi
 

From 2f6f02524cfacf47636828d648baa4208184e35e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 11 Jul 2023 13:22:29 +0200
Subject: [PATCH 2/2] [ci] Run pre-commit in reduced pipelines too.

---
 scripts/ci/pipelines/linux.yml | 1 +
 scripts/ci/pipelines/mac.yml   | 1 +
 scripts/ci/pipelines/win.yml   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/scripts/ci/pipelines/linux.yml b/scripts/ci/pipelines/linux.yml
index 8d06b9d723d..ad3ec97dc1c 100644
--- a/scripts/ci/pipelines/linux.yml
+++ b/scripts/ci/pipelines/linux.yml
@@ -1,5 +1,6 @@
 include:
   - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/meta.yml"
   - local: "/scripts/ci/jobs/ci_images.yml"
   - local: "/scripts/ci/jobs/build-linux.yml"
diff --git a/scripts/ci/pipelines/mac.yml b/scripts/ci/pipelines/mac.yml
index 978f1ab9c6e..ce7824a5fc0 100644
--- a/scripts/ci/pipelines/mac.yml
+++ b/scripts/ci/pipelines/mac.yml
@@ -1,5 +1,6 @@
 include:
   - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/meta.yml"
   - local: "/scripts/ci/jobs/build-mac.yml"
   - local: "/scripts/ci/jobs/build-gui-mac.yml"
diff --git a/scripts/ci/pipelines/win.yml b/scripts/ci/pipelines/win.yml
index 2ceb8f4819b..8ee2097ed74 100644
--- a/scripts/ci/pipelines/win.yml
+++ b/scripts/ci/pipelines/win.yml
@@ -1,5 +1,6 @@
 include:
   - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/meta.yml"
   - local: "/scripts/ci/jobs/build-win.yml"
   - local: "/scripts/ci/jobs/build-gui-win.yml"