From b76c93bdc1100b27ece849e73fa6c54a99e9d27e Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Wed, 17 Jul 2024 14:23:55 -0400 Subject: [PATCH 1/5] CI: Build and test JANA inside eic-shell --- .github/workflows/eicshell.yml | 73 ++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/eicshell.yml diff --git a/.github/workflows/eicshell.yml b/.github/workflows/eicshell.yml new file mode 100644 index 000000000..8d98187c3 --- /dev/null +++ b/.github/workflows/eicshell.yml @@ -0,0 +1,73 @@ + +name: Test JANA2 against eic-shell/EICrecon + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + jana2_eicshell: + name: Build JANA2 on eic-shell + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: cvmfs-contrib/github-action-cvmfs@v2 + + - name: cmake + uses: eic/run-cvmfs-osg-eic-shell@main + with: + platform-release: "jug_xl:nightly" + run: | + mkdir -p $GITHUB_WORKSPACE/build + cd $GITHUB_WORKSPACE/build + echo "Path is $PATH" + ls /opt/local/bin + cmake .. \ + -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/jana_home \ + -DUSE_PYTHON=ON \ + -DUSE_ROOT=ON \ + -DUSE_PODIO=ON \ + -DUSE_XERCES=ON \ + -DUSE_ZEROMQ=ON + + - name: make install + uses: eic/run-cvmfs-osg-eic-shell@main + with: + platform-release: "jug_xl:nightly" + run: | + cd $GITHUB_WORKSPACE/build + make -j4 install + + - name: Run JTest plugin with 100 events + uses: eic/run-cvmfs-osg-eic-shell@main + with: + platform-release: "jug_xl:nightly" + run: | + $GITHUB_WORKSPACE/jana_home/bin/jana -PPLUGINS=JTest -Pjana:nevents=100 + + - name: Run jana-unit-tests + uses: eic/run-cvmfs-osg-eic-shell@main + with: + platform-release: "jug_xl:nightly" + run: | + $GITHUB_WORKSPACE/jana_home/bin/jana-unit-tests + + - name: Run TimesliceExample with simple (physics event) topology + uses: eic/run-cvmfs-osg-eic-shell@main + with: + platform-release: "jug_xl:nightly" + run: | + echo "--- Running TimesliceExample with simple topology ------------------------------" + $GITHUB_WORKSPACE/jana_home/bin/jana -Pjana:plugin_path=$GITHUB_WORKSPACE/jana_home/plugins -Pplugins=TimesliceExample -Pjana:nevents=100 events.root + + - name: Run TimesliceExample with complex (timeslice) topology + uses: eic/run-cvmfs-osg-eic-shell@main + with: + platform-release: "jug_xl:nightly" + run: | + echo "--- Running TimesliceExample with simple topology ------------------------------" + $GITHUB_WORKSPACE/jana_home/bin/jana -Pjana:plugin_path=$GITHUB_WORKSPACE/jana_home/plugins -Pplugins=TimesliceExample -Pjana:nevents=100 timeslices.root + + From 31107d7b8150fa5f3c9fdf9128bf7a59266ccc7e Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Thu, 18 Jul 2024 22:56:57 -0400 Subject: [PATCH 2/5] eic-shell CI job: Set CMAKE_CXX_STANDARD=20 --- .github/workflows/eicshell.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/eicshell.yml b/.github/workflows/eicshell.yml index 8d98187c3..9444895db 100644 --- a/.github/workflows/eicshell.yml +++ b/.github/workflows/eicshell.yml @@ -22,10 +22,9 @@ jobs: run: | mkdir -p $GITHUB_WORKSPACE/build cd $GITHUB_WORKSPACE/build - echo "Path is $PATH" - ls /opt/local/bin cmake .. \ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/jana_home \ + -DCMAKE_CXX_STANDARD=20 \ -DUSE_PYTHON=ON \ -DUSE_ROOT=ON \ -DUSE_PODIO=ON \ From f8a99678597d1c1f36e6878a6f82dcc35813f476 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Thu, 18 Jul 2024 23:15:44 -0400 Subject: [PATCH 3/5] eic-shell CI job: Help CMake find XercesC --- .github/workflows/eicshell.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/eicshell.yml b/.github/workflows/eicshell.yml index 9444895db..a3dbde83c 100644 --- a/.github/workflows/eicshell.yml +++ b/.github/workflows/eicshell.yml @@ -29,7 +29,9 @@ jobs: -DUSE_ROOT=ON \ -DUSE_PODIO=ON \ -DUSE_XERCES=ON \ - -DUSE_ZEROMQ=ON + -DUSE_ZEROMQ=ON \ + -DUSE_ASAN=ON \ + -DXercesC_DIR=/opt/local - name: make install uses: eic/run-cvmfs-osg-eic-shell@main From 6b5fac2c46a60721815854935113cdb1735ddbf3 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Thu, 18 Jul 2024 23:37:38 -0400 Subject: [PATCH 4/5] eic-shell CI job: Help jana find the correct plugins --- .github/workflows/eicshell.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/eicshell.yml b/.github/workflows/eicshell.yml index a3dbde83c..37f9bd36a 100644 --- a/.github/workflows/eicshell.yml +++ b/.github/workflows/eicshell.yml @@ -46,7 +46,10 @@ jobs: with: platform-release: "jug_xl:nightly" run: | - $GITHUB_WORKSPACE/jana_home/bin/jana -PPLUGINS=JTest -Pjana:nevents=100 + $GITHUB_WORKSPACE/jana_home/bin/jana \ + -Pjana:plugin_path=$GITHUB_WORKSPACE/jana_home/plugins \ + -Pplugins=JTest \ + -Pjana:nevents=100 - name: Run jana-unit-tests uses: eic/run-cvmfs-osg-eic-shell@main @@ -61,7 +64,11 @@ jobs: platform-release: "jug_xl:nightly" run: | echo "--- Running TimesliceExample with simple topology ------------------------------" - $GITHUB_WORKSPACE/jana_home/bin/jana -Pjana:plugin_path=$GITHUB_WORKSPACE/jana_home/plugins -Pplugins=TimesliceExample -Pjana:nevents=100 events.root + $GITHUB_WORKSPACE/jana_home/bin/jana \ + -Pjana:plugin_path=$GITHUB_WORKSPACE/jana_home/plugins \ + -Pplugins=TimesliceExample \ + -Pjana:nevents=100 \ + events.root - name: Run TimesliceExample with complex (timeslice) topology uses: eic/run-cvmfs-osg-eic-shell@main From 103a4047e217eb9a37d56700a0e9ffba84d19ffe Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Thu, 18 Jul 2024 23:49:23 -0400 Subject: [PATCH 5/5] eic-shell CI job: disable ASAN for now --- .github/workflows/eicshell.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/eicshell.yml b/.github/workflows/eicshell.yml index 37f9bd36a..91ba19635 100644 --- a/.github/workflows/eicshell.yml +++ b/.github/workflows/eicshell.yml @@ -30,7 +30,6 @@ jobs: -DUSE_PODIO=ON \ -DUSE_XERCES=ON \ -DUSE_ZEROMQ=ON \ - -DUSE_ASAN=ON \ -DXercesC_DIR=/opt/local - name: make install