Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: update workflows #74

Merged
merged 2 commits into from
Apr 3, 2024
Merged

CI: update workflows #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b53c7
CI: update workflows
andresailer Apr 2, 2024
9f4809a
Tests: move to latest CLIC model, old one is no longer DD4hep compatible
andresailer Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions Tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand All @@ -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
Expand Down