diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4eaaae9..197626c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,13 +7,13 @@ jobs: strategy: fail-fast: false matrix: - COMPILER: [gcc10, clang11] - LCG: [100] + COMPILER: [gcc11] + LCG: [104] steps: - - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@v2 - - uses: aidasoft/run-lcg-view@v3 + - uses: actions/checkout@v4 + - uses: cvmfs-contrib/github-action-cvmfs@v4 + - uses: aidasoft/run-lcg-view@v4 with: view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/${{ matrix.LCG }}/nightly/x86_64-centos7-${{ matrix.COMPILER }}-opt" setup-script: "init_ilcsoft.sh" diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 40a0bbf..19dd50d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -5,11 +5,11 @@ ENDIF() SET( test_name "BeamCalReco" ) ADD_TEST( NAME t_${test_name} COMMAND - TestBeamCalReco $ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml BeamCal + TestBeamCalReco $ENV{lcgeo_DIR}/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml BeamCal ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "phi not correctly reconstructed" - REQUIRED_FILES "$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml" + REQUIRED_FILES "$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml" ) SET( test_name "LumiCalReco" ) @@ -33,11 +33,11 @@ ENDIF() SET( test_name "NewLumimCalReco" ) ADD_TEST( NAME t_${test_name} COMMAND - TestBeamCalReco $ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml LumiCal + TestBeamCalReco $ENV{lcgeo_DIR}/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml LumiCal ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "phi not correctly reconstructed" - REQUIRED_FILES "$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml" + REQUIRED_FILES "$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml" ) ADD_TEST( NAME test_Sim_BeamCal