From 187b2e582fca537361dbb467af6fbb54f20b9f99 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Thu, 28 Nov 2024 11:20:34 +0100 Subject: [PATCH 1/3] ci: Add LCG 106a job --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0a213e607d..b6d9e3e2b18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -431,3 +431,17 @@ lcg_105: COMPILER: - gcc13 - clang16 + +lcg_106a: + extends: .lcg_base_job + + variables: + LCG_VERSION: "106a" + + parallel: + matrix: + - OS: [alma9] + COMPILER: + - gcc13 + - gcc14 + - clang16 From 9ff274d707575420e3029782fd86c2f612a7ebaa Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Fri, 29 Nov 2024 08:53:50 +0100 Subject: [PATCH 2/3] always el9 --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6d9e3e2b18..c897c947010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -382,11 +382,7 @@ linux_ubuntu_2204_clang: # Figure out LCG platform name based on version number and OS - > if [ "$OS" = "alma9" ]; then - if [ "$LCG_VERSION" -ge "104" ]; then - export LCG_PLATFORM="el9" - else - export LCG_PLATFORM="centos9" - fi + export LCG_PLATFORM="el9" else export LCG_PLATFORM="$OS" fi From e53e0842044e570371966263dcb9c0c2a94fc0c3 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Fri, 29 Nov 2024 13:08:39 +0100 Subject: [PATCH 3/3] bump ODD to v4.0.3 --- thirdparty/OpenDataDetector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/OpenDataDetector b/thirdparty/OpenDataDetector index 0bf11ff33bd..4c5e7413a50 160000 --- a/thirdparty/OpenDataDetector +++ b/thirdparty/OpenDataDetector @@ -1 +1 @@ -Subproject commit 0bf11ff33bd10d3070e6ecbc4bea0a7c42d86fa0 +Subproject commit 4c5e7413a505a7743cbec9544901e8c55172e513