From 6dd6911150e08242ce389f56c644276311c05756 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 09:52:06 -0400 Subject: [PATCH 01/13] cleanup --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 366580249b..a6bdd8d792 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,3 @@ -# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - name: Coatjava-CI on: @@ -7,10 +5,6 @@ on: push: branches: [ development ] tags: [ '*' ] - schedule: - # NOTE: From what I read, the email notification for cron can only go - # to the last committer of this file!!!!! - - cron: '0 22 * * *' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} From e58efab6dac0dc6e41d056735f3afb57bfa11aba Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 10:13:15 -0400 Subject: [PATCH 02/13] test --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6bdd8d792..22314d892d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,12 +66,6 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - name: setup cvmfs - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - - name: cvmfs - run: ls /cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite - name: bump version to tag if tag trigger if: ${{ github.ref_type == 'tag' }} run: libexec/version-bump.sh ${{ github.ref_name }} From d3d7d1a55f799327e7f82bc842aafbf1eec2cb1e Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 10:55:05 -0400 Subject: [PATCH 03/13] add sqlite submodule --- .gitmodules | 3 +++ etc/data/sqlite | 1 + 2 files changed, 4 insertions(+) create mode 160000 etc/data/sqlite diff --git a/.gitmodules b/.gitmodules index 0d3a763a6c..5eb8b2f497 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "etc/nnet"] path = etc/data/nnet url = https://code.jlab.org/hallb/clas12/coatjava/networks.git +[submodule "etc/data/sqlite"] + path = etc/data/sqlite + url = https://code.jlab.org/hallb/clas12/ccdbrcdb-sqlite diff --git a/etc/data/sqlite b/etc/data/sqlite new file mode 160000 index 0000000000..1f4f527008 --- /dev/null +++ b/etc/data/sqlite @@ -0,0 +1 @@ +Subproject commit 1f4f52700867bfbe094af24f77ae2e4f0af4c870 From ecce1f6ce5ba5ea33cb5dd09d84e6d47dcc352f4 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 10:56:10 -0400 Subject: [PATCH 04/13] add sqlite to build script --- build-coatjava.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-coatjava.sh b/build-coatjava.sh index 3bf00d346b..9662d4d281 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -287,6 +287,7 @@ if $downloadData; then lfs) notify_retrieval 'validation data' 'lfs' download_lfs validation/advanced-tests/data + download_lfs etc/data/sqlite ;; *) echo 'ERROR: option `--lfs` must be used when using `--data`' >&2 From 291df19453f05f72aaf410368a33db14e96d5020 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 10:57:50 -0400 Subject: [PATCH 05/13] use sqlite --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22314d892d..c17398c967 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: java_distribution: zulu javadoc_version: 25 # newer than `JAVA_VERSION` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:////cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite' + CCDB_CONNECTION: 'sqlite:///etc/data/sqlite/ccdb.sqlite' nthreads: 1 jobs: From 055b59292d8c0adf69a762fa5f85aacce9c09ece Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 12:39:45 -0400 Subject: [PATCH 06/13] fix path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c17398c967..6ed7ce54fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: java_distribution: zulu javadoc_version: 25 # newer than `JAVA_VERSION` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:///etc/data/sqlite/ccdb.sqlite' + CCDB_CONNECTION: 'sqlite:///coatjava/etc/data/sqlite/ccdb.sqlite' nthreads: 1 jobs: From fb40538d7c049469047e82efdd3da7a21a990197 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 13:09:31 -0400 Subject: [PATCH 07/13] fix path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ed7ce54fa..b941f898c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: java_distribution: zulu javadoc_version: 25 # newer than `JAVA_VERSION` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:///coatjava/etc/data/sqlite/ccdb.sqlite' + CCDB_CONNECTION: 'sqlite:///$GITHUB_WORKSPACE/coatjava/etc/data/sqlite/ccdb.sqlite' nthreads: 1 jobs: From 6df92ade9ead9365935e84fe8faa751b8e1e3447 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 13:36:40 -0400 Subject: [PATCH 08/13] fix path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b941f898c1..4c43e4c0d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: java_distribution: zulu javadoc_version: 25 # newer than `JAVA_VERSION` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:///$GITHUB_WORKSPACE/coatjava/etc/data/sqlite/ccdb.sqlite' + CCDB_CONNECTION: 'sqlite:////home/runner/work/coatjava/coatjava/etc/data/sqlite/ccdb.sqlite' nthreads: 1 jobs: From 15744230495b2dc213acec0caf5aa1d7656bc4f2 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 15:16:15 -0400 Subject: [PATCH 09/13] add sqlites from lfs --- build-coatjava.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build-coatjava.sh b/build-coatjava.sh index 9662d4d281..51b73abaf0 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -13,6 +13,7 @@ cleanBuild=false runSpotBugs=false downloadMaps=true downloadNets=true +downloadSqlites=true runUnitTests=false dataRetrieval=lfs installClara=false @@ -40,6 +41,7 @@ DATA RETRIEVAL OPTIONS Additional options --nomaps do not download/overwrite field maps --nonets do not download/overwrite neural networks + --nosqlites do not download/overwrite SQLite files for CCDB/RCDB --wipe remove retrieved data TESTING OPTIONS @@ -66,6 +68,7 @@ do -n) runSpotBugs=false ;; --nomaps) downloadMaps=false ;; --nonets) downloadNets=false ;; + --nosqlites) downloadSqlites=false ;; --unittests) runUnitTests=true ;; --clean) cleanBuild=true ;; --depana) @@ -281,13 +284,25 @@ if $downloadNets; then esac fi +# download neural networks +if $downloadSqlites; then + case $dataRetrieval in + lfs) + notify_retrieval 'ccdb/rcdb SQLite files' 'lfs' + download_lfs etc/data/sqlite + ;; + *) + echo 'WARNING: sqlites not downloaded; run with `--help` for guidance' >&2 + ;; + esac +fi + # download validation data if $downloadData; then case $dataRetrieval in lfs) notify_retrieval 'validation data' 'lfs' download_lfs validation/advanced-tests/data - download_lfs etc/data/sqlite ;; *) echo 'ERROR: option `--lfs` must be used when using `--data`' >&2 From 996061a4031c7190db0fc161a37ae5cc7c98e0bc Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 15:28:27 -0400 Subject: [PATCH 10/13] fix path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c43e4c0d6..6dfb8192d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: java_distribution: zulu javadoc_version: 25 # newer than `JAVA_VERSION` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:////home/runner/work/coatjava/coatjava/etc/data/sqlite/ccdb.sqlite' + CCDB_CONNECTION: 'sqlite:////home/runner/work/coatjava/coatjava/coatjava/etc/data/sqlite/ccdb.sqlite' nthreads: 1 jobs: From 40bec3a7ec6b9e79217fbaca46e49b6995d4b229 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 15:40:46 -0400 Subject: [PATCH 11/13] remove github-ci reliance on cvmfs --- .github/workflows/ci.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6dfb8192d6..a2eceab898 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,12 +96,6 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - name: setup cvmfs - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - - name: cvmfs - run: ls /cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite - name: bump version to tag if tag trigger if: ${{ github.ref_type == 'tag' }} run: libexec/version-bump.sh ${{ github.ref_name }} @@ -148,9 +142,6 @@ jobs: java-version: ${{ matrix.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - name: unit tests run: ./build-coatjava.sh --lfs --unittests --no-progress -T${{ env.nthreads }} - name: collect jacoco report @@ -175,9 +166,6 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - uses: actions/download-artifact@v8 with: name: build_ubuntu-latest @@ -197,9 +185,6 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - uses: actions/download-artifact@v8 with: name: build_ubuntu-latest @@ -229,10 +214,6 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - name: setup cvmfs - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - uses: actions/download-artifact@v8 with: name: build_ubuntu-latest @@ -286,9 +267,6 @@ jobs: - uses: actions/download-artifact@v8 with: name: build_${{ matrix.runner }} - - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - name: untar build run: | tar xzvf coatjava.tar.gz @@ -317,9 +295,6 @@ jobs: - uses: actions/download-artifact@v8 with: name: build_macos - - uses: cvmfs-contrib/github-action-cvmfs@v5 - with: - cvmfs_repositories: 'oasis.opensciencegrid.org' - name: untar build run: | tar xzvf coatjava.tar.gz From 6e5300bf382a668d0e0a5da3bd7fcf70a8494e13 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 17:02:37 -0400 Subject: [PATCH 12/13] take that --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2eceab898..f4afdf077c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: java_distribution: zulu javadoc_version: 25 # newer than `JAVA_VERSION` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:////home/runner/work/coatjava/coatjava/coatjava/etc/data/sqlite/ccdb.sqlite' + CCDB_CONNECTION: 'sqlite:///${{ github.workspace }}/coatjava/etc/data/sqlite/ccdb.sqlite' nthreads: 1 jobs: From 894698b08f5292d04e538d0e4369235e4eabde77 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 30 Jun 2026 17:28:30 -0400 Subject: [PATCH 13/13] untar coatjava too, for sqlite --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4afdf077c..a423ffb39b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,6 +225,7 @@ jobs: - name: untar build run: | tar xzvf clara.tar.gz + tar xzvf coatjava.tar.gz - name: run test run: | ls -lhtr