From cfaaa7ef81e18b506815f2e8f71ff612174efec9 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Fri, 31 Jan 2025 10:34:55 +0100 Subject: [PATCH] [ci] Switch to LCG_106b for sanitizer workflows (#730) * [ci] Switch to LCG_106b for sanitizer workflows Pick up a newer version of ROOT * Switch to newer versions for LCG builds Keep an older version for compatibility checks but disable RNTuple --- .github/workflows/sanitizers.yaml | 2 +- .github/workflows/test.yml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sanitizers.yaml b/.github/workflows/sanitizers.yaml index da47f859f..b3fe280a9 100644 --- a/.github/workflows/sanitizers.yaml +++ b/.github/workflows/sanitizers.yaml @@ -32,7 +32,7 @@ jobs: - uses: cvmfs-contrib/github-action-cvmfs@v4 - uses: aidasoft/run-lcg-view@v4 with: - release-platform: LCG_105/x86_64-el9-${{ matrix.compiler }}-opt + release-platform: LCG_106b/x86_64-el9-${{ matrix.compiler }}-opt run: | echo "::group::Run CMake" mkdir build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dac51c2f3..bdd1fde60 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,9 @@ jobs: LCG: ["dev3/x86_64-el9-clang16-opt", "dev4/x86_64-el9-clang16-opt", "dev4/x86_64-el9-gcc13-opt", - "LCG_105/x86_64-el9-clang16-opt", - "LCG_105/x86_64-el9-gcc13-opt"] + "LCG_106b/x86_64-el9-clang16-opt", + "LCG_106b/x86_64-el9-gcc13-opt", + "LCG_104/x86_64-el9-gcc13-opt"] steps: - uses: actions/checkout@v4 - uses: cvmfs-contrib/github-action-cvmfs@v4 @@ -31,7 +32,7 @@ jobs: cd build cmake -DENABLE_SIO=ON \ -DENABLE_JULIA=ON \ - -DENABLE_RNTUPLE=ON \ + -DENABLE_RNTUPLE=$([[ ${{ matrix.LCG }} == LCG_104/* ]] && echo "OFF" || echo "ON") \ -DENABLE_DATASOURCE=ON \ -DCMAKE_INSTALL_PREFIX=../install \ -DCMAKE_CXX_STANDARD=20 \