From ced5f82e705faeb2bf5583a205b7e7b23f45a45f Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Tue, 17 Dec 2024 13:02:02 -0700 Subject: [PATCH 1/2] ci: update settings --- .gitlab/common.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab/common.yml b/.gitlab/common.yml index 2da1bb14b..5d2302cf6 100644 --- a/.gitlab/common.yml +++ b/.gitlab/common.yml @@ -76,7 +76,7 @@ default: .venado_job: variables: CLUSTER: venado - SCHEDULER_PARAMETERS: "-N 1 -A lanl_ai_g -p gpu --time=02:00:00" + SCHEDULER_PARAMETERS: "-N 1 -A asc-ci_g -p ci_g --qos ci_g --reservation ci_g --time=02:00:00" tags: - venado - batch @@ -105,6 +105,7 @@ default: variables: CLUSTER: rzansel LLNL_LSF_SCHEDULER_PARAMETERS: "--nnodes=1" + CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/xcap-gitlab-ci" .rzansel_regular_job: variables: @@ -123,6 +124,7 @@ default: variables: CLUSTER: rzvernal LLNL_FLUX_SCHEDULER_PARAMETERS: "-N=1 --time-limit=2h" + CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/xcap-gitlab-ci" .rzvernal_regular_job: variables: @@ -141,6 +143,7 @@ default: variables: CLUSTER: rzadams LLNL_FLUX_SCHEDULER_PARAMETERS: "-N=1 --time-limit=2h" + CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/xcap-gitlab-ci" .rzadams_regular_job: variables: From b5b40597630270c94e498ab544cba2f3cd34aacd Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Thu, 19 Dec 2024 11:15:47 -0700 Subject: [PATCH 2/2] update catch2 --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8e019ce3e..4aca098a5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,7 +12,7 @@ spiner_content_declare(Catch2 GIT_REPO https://github.com/catchorg/Catch2.git - GIT_TAG v3.0.1 # or any later release + GIT_TAG v3.7.1 # or any later release EXPECTED_TARGETS Catch2::Catch2 NAMESPACE spinerTest )