CI improvements

.github/jana_build.sh → .github/build_and_run_gluex_integration_tests.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
-echo "mounting cvmfs"
+echo "Mounting CVMFS"
 yum -y install fuse
 chmod 666 /dev/fuse
 mkdir -p /cvmfs/oasis.opensciencegrid.org
 mount -t cvmfs oasis.opensciencegrid.org /cvmfs/oasis.opensciencegrid.org
+ln -s /cvmfs/oasis.opensciencegrid.org/gluex/group /group
 
 export CC=$(which gcc)
 export CXX=$(which g++)
@@ -15,12 +16,15 @@ export JANA_PLUGIN_PATH=$PROJECT_ROOT/JANA2/plugins
 source $BUILD_SCRIPTS/gluex_env_boot_jlab.sh --bs $BUILD_SCRIPTS
 gxenv $PROJECT_ROOT/JANA2/.github/version.xml
 
-echo "jana_home value: $JANA_HOME"
+echo "Building JANA2 with JANA_HOME=$JANA_HOME"
 
 cd $JANA_HOME
 mkdir -p build
 cd build
-
-echo "Building start"
-cmake3 $JANA_HOME -DUSE_XERCES=1 -DCMAKE_CXX_STANDARD=17
+cmake3 $JANA_HOME -DUSE_XERCES=1 -DCMAKE_CXX_STANDARD=20
 make install -j12
+
+echo "ROOTSYS=$ROOTSYS"
+cd /workspace/halld_recon/src
+scons install -j6 DEBUG=1 OPTIMIZATION=0 SHOWBUILD=1
+

.github/workflows/documentation.yml → .github/workflows/build_documentation.yml

@@ -1,4 +1,4 @@
-name: Documentation generation
+name: Build documentation
 
 on:
   push:

.github/workflows/ccpp-docker.yml → .github/workflows/test_dependency_matrix.yml

@@ -1,4 +1,4 @@
-name: C/C++ CI docker
+name: Dependency matrix tests
 
 on:
   push:

.github/workflows/eicshell.yml → .github/workflows/test_integration_epic.yml

@@ -1,5 +1,5 @@
 
-name: eic-shell
+name: Integration tests - ePIC
 
 on:
   push:

.github/workflows/test_integration_gluex.yml

@@ -0,0 +1,34 @@
+name: Integration tests - GlueX
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  jana2_halld_recon:
+    name: halld_recon
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with: 
+          path: JANA2
+
+      - name: Clone halld_recon
+        run: |
+          mkdir halld_recon
+          cd halld_recon
+          git clone -b master https://github.com/JeffersonLab/halld_recon.git .
+
+      - name: Build halld_recon
+        run: |
+          docker run --rm \
+            --privileged \
+            --mount type=bind,source=${{ github.workspace }},target=/workspace \
+            codecr.jlab.org/nbrei/jana2-ci/jana2_devenv_alma9:latest /workspace/JANA2/.github/build_and_run_gluex_integration_tests.sh
+
+
+
+

.github/workflows/cuda-farm.yml → .github/workflows/test_platform_farm_cuda.yml

@@ -1,4 +1,4 @@
-name: CUDA CI farm
+name: Platform tests - Farm+CUDA
 
 # disable this one by naming an invalid branch
 on:

.github/workflows/ccpp-macos.yml → .github/workflows/test_platform_mac.yml

@@ -1,4 +1,4 @@
-name: C/C++ CI macOS-latest
+name: Platform tests - macOS
 
 on:
   push:

.github/workflows/ccpp-linux.yml → .github/workflows/test_platform_ubuntu.yml

@@ -1,4 +1,4 @@
-name: C/C++ CI ubuntu
+name: Platform tests - Ubuntu
 
 on:
   push:

.github/workflows/trigger-gitlab.yml

@@ -1,4 +1,4 @@
-name: trigger-gitlab
+name: Trigger GitLab
 on:
   push:
     branches: [master]

README.md

@@ -1,12 +1,20 @@
-![C/C++ CI ubuntu](https://github.com/JeffersonLab/JANA2/actions/workflows/ccpp-linux.yml/badge.svg)<br>
-![C/C++ CI docker](https://github.com/JeffersonLab/JANA2/actions/workflows/ccpp-docker.yml/badge.svg)<br>
-![C/C++ CI macos](https://github.com/JeffersonLab/JANA2/actions/workflows/ccpp-macos.yml/badge.svg)<br>
-![C/C++ CI cuda-ifarm](https://github.com/JeffersonLab/JANA2/actions/workflows/cuda-farm.yml/badge.svg)<br>
+
+
+![Dependency matrix tests](https://github.com/JeffersonLab/JANA2/actions/workflows/test_dependency_matrix.yml/badge.svg)
+
+<br>
+
+![ePIC integration tests](https://github.com/JeffersonLab/JANA2/actions/workflows/test_integration_epic.yml/badge.svg)
+
+<br>
+
+![GlueX integration tests](https://github.com/JeffersonLab/JANA2/actions/workflows/test_integration_gluex.yml/badge.svg)
+<br>
 
 [![DOI](https://zenodo.org/badge/117695469.svg)](https://zenodo.org/badge/latestdoi/117695469)
 ## Welcome to JANA!
 
-JANA is a C++ framework for multi-threaded HENP (High Energy and Nuclear Physics)  event reconstruction.
+JANA is a C++ framework for multi-threaded HENP (High Energy and Nuclear Physics) event reconstruction.
 Please see the [JANA website](https://jeffersonlab.github.io/JANA2/) for full documentation.
 
 JANA2 is a complete rewrite retaining successful features from the original while modernizing the framework for a new generation of experiments. The code is under active development, but is ready for use as is. You are welcome to