From e67fb4dacd1c46e1a16bab84cb8e8e5f8bc25403 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Mon, 15 Jan 2024 14:15:59 +0100 Subject: [PATCH 1/2] Use newer clicdp nightlies in CI --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 55a13de..36e60c4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,8 +7,8 @@ jobs: strategy: fail-fast: false matrix: - COMPILER: [gcc10, clang11] - LCG: [100] + COMPILER: [gcc11] + LCG: [104] steps: - uses: actions/checkout@v3 From fd3f7c1450c34c60303a36157576d4feba9ec6a0 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Mon, 15 Jan 2024 14:17:10 +0100 Subject: [PATCH 2/2] Update key4hep based CI workflows --- .github/workflows/key4hep.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml index 347af31..f47edd6 100644 --- a/.github/workflows/key4hep.yml +++ b/.github/workflows/key4hep.yml @@ -6,6 +6,12 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false + matrix: + include: + - release: "sw.hsf.org/key4hep" + CXX_STANDARD: 17 + - release: "sw-nightlies.hsf.org/key4hep" + CXX_STANDARD: 20 steps: - uses: actions/checkout@v3 @@ -13,14 +19,14 @@ jobs: - uses: aidasoft/run-lcg-view@v4 with: container: centos7 - view-path: /cvmfs/sw-nightlies.hsf.org/key4hep + view-path: /cvmfs/${{ matrix.release }} run: | mkdir build cd build echo "::group::Run CMake" cmake -GNinja \ -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror " \ - -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \ -DCMAKE_INSTALL_PREFIX=../install \ .. echo "::endgroup::" && echo "::group::Build"