Skip to content

Commit

Permalink
Merge branch 'main' into fix/remove-final
Browse files Browse the repository at this point in the history
  • Loading branch information
AJPfleger authored Nov 29, 2024
2 parents 01fe523 + 6a836db commit cf7db32
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
20 changes: 15 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -431,3 +427,17 @@ lcg_105:
COMPILER:
- gcc13
- clang16

lcg_106a:
extends: .lcg_base_job

variables:
LCG_VERSION: "106a"

parallel:
matrix:
- OS: [alma9]
COMPILER:
- gcc13
- gcc14
- clang16
2 changes: 1 addition & 1 deletion thirdparty/OpenDataDetector
Submodule OpenDataDetector updated from 0bf11f to 4c5e74

0 comments on commit cf7db32

Please sign in to comment.