test

.github/workflows/main.yml

@@ -1,66 +1,48 @@
 name: C++ CI Testing
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches: [ master ]
+    tags: [ '*' ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true # cancel in-progress workflows on the same PR branch
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
-build_and_test:
+  build_and_test:
     runs-on: ubuntu-latest
-    container: rootproject/root:${{ matrix.version }}
-    strategy:
-      matrix:
-        version: [6.28.12-ubuntu22.04]
+    container:
+      image: codecr.jlab.org/hallb/clas12/container-forge/base_root:latest
 
     steps:
-      - name: system dependancies
-        run: |
-          apt update
-          apt -y install git scons python2
 
       - name: checkout repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          path: .
-
-      - name: set env vars
-        run: |
-          echo "CLAS12ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-          echo "HIPO=$GITHUB_WORKSPACE/hipo" >> $GITHUB_ENV
-          echo "CCDB_HOME=$GITHUB_WORKSPACE/ccdb" >> $GITHUB_ENV
-          echo "RCDB_HOME=$GITHUB_WORKSPACE/rcdb" >> $GITHUB_ENV
-          echo "QADB=$GITHUB_WORKSPACE/clas12-qadb" >> $GITHUB_ENV
-
-      - name: set paths
-        run: |
-          echo "PYTHONPATH=$CCDB_HOME/python:$RCDB_HOME/python:$PYTHONPATH" >> $GITHUB_ENV
-          echo "PATH=$PWD/bin:$CCDB_HOME:$CCDB_HOME/bin:$RCDB_HOME/bin:$RCDB_HOME/cpp/bin:$PATH" >> $GITHUB_ENV
-          echo "LD_LIBRARY_PATH=$RCDB_HOME/cpp/lib:$CCDB_HOME/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
-
-
-      - name: checkout hipo
-        uses: actions/checkout@v4
-        with:
-          repository: gavalian/hipo
-          ref: 4.0.1 # if you want to use a fixed tag; remove if you want to use `main`
-          path: ${HIPO}
+        uses: actions/checkout@v5
 
-      - name: build hipo
+      - name: set clas12root env vars
         run: |
-          cd $HIPO
-          cmake -DCMAKE_INSTALL_PREFIX=$HIPO
-          cmake --build . --target install
-
-      - name: build ccdb
+          CLAS12ROOT=$GITHUB_WORKSPACE
+          PATH=$CLAS12ROOT/bin${PATH:+:${PATH}}
+          LD_LIBRARY_PATH=$CLAS12ROOT/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+          ROOT_INCLUDE_PATH=$CLAS12ROOT/Clas12Root:$CLAS12ROOT/Clas12Banks${ROOT_INCLUDE_PATH:+:${ROOT_INCLUDE_PATH}}
+          echo CLAS12ROOT=$CLAS12ROOT | tee -a $GITHUB_ENV
+          echo PATH=$PATH | tee -a $GITHUB_ENV
+          echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH | tee -a $GITHUB_ENV
+          echo ROOT_INCLUDE_PATH=$ROOT_INCLUDE_PATH | tee -a $GITHUB_ENV
+
+      - name: print versions
         run: |
-          cd $CCDB_HOME
-          bash environment.bash
-          /usr/bin/env python2 $(which scons)
+          cmake --version
+          root --version
 
       - name: build clas12root
-        run: |
-          ./installC12Root
+        run: ./installC12Root
 
       - name: run example on data file
-        run: |
-          export CLAS12ROOT=$PWD
-          ./bin/clas12root -q ./tests/read_file.C
+        run: ./bin/clas12root -q ./tests/read_file.C

.gitignore

@@ -1,10 +1,13 @@
 # diff between stock checkout and after ./installC12Root
 bin
 build
-hipo4
 lib
 man
 
+# dependency installations
+##############
+/hipo
+
 # hipo source
 ##############
 ExtraPackages/rhipo/chipo/

.gitmodules

@@ -1,12 +1,15 @@
 [submodule "lz4"]
 	path = lz4
 	url = https://github.com/lz4/lz4.git
+[submodule "clas12-qadb"]
+	path = clas12-qadb
+	url = https://github.com/JeffersonLab/clas12-qadb.git
 [submodule "ccdb"]
 	path = ccdb
-	url = https://github.com/JeffersonLab/ccdb.git
+	url = https://code.jlab.org/hallb/clas12/ccdb.git
+[submodule "hipo_src"]
+	path = hipo_src
+	url = https://code.jlab.org/hallb/clas12/hipo-cpp.git
 [submodule "rcdb"]
 	path = rcdb
-	url = https://github.com/JeffersonLab/rcdb
-[submodule "clas12-qadb"]
-	path = clas12-qadb
-	url = https://github.com/JeffersonLab/clas12-qadb
+	url = https://code.jlab.org/hallb/clas12/rcdb.git