From 2487673d767eb98898bf8fe9591422d76293c514 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 20 Nov 2025 10:52:57 -0500 Subject: [PATCH 1/4] use main branch for now --- install-clara | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install-clara b/install-clara index 876d0c408a..722b3bb328 100755 --- a/install-clara +++ b/install-clara @@ -56,7 +56,8 @@ function cleanup() { } function build_clara { - git clone --branch $clara --depth 1 https://code.jlab.org/hallb/clas12/clara-java + #git clone --branch $clara --depth 1 https://code.jlab.org/hallb/clas12/clara-java + git clone --depth 1 https://code.jlab.org/hallb/clas12/clara-java cd clara-java && CLARA_HOME=$1 ./gradlew deploy && cd - } From d09dcc0307ad15a138a24ace0021d12c0fae6cde Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 20 Nov 2025 10:53:04 -0500 Subject: [PATCH 2/4] build clara from source --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e74ee6e365..a50fe4a985 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,9 @@ jobs: if: ${{ github.ref_type == 'tag' }} run: libexec/version-bump.sh ${{ github.ref_name }} - name: build - run: ./build-coatjava.sh --clara --cvmfs --no-progress -T${{ env.nthreads }} + run: | + ./build-coatjava.sh --cvmfs --no-progress -T${{ env.nthreads }} + ./install-clara -b -c ./coatjava ./clara - name: tar # tarball to preserve permissions run: | tar czvf coatjava.tar.gz coatjava From 232baae3903d320484e0e160261eaa42b06ac4c2 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 20 Nov 2025 12:11:31 -0500 Subject: [PATCH 3/4] build grapes from source --- install-clara | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/install-clara b/install-clara index 722b3bb328..e66aad22e3 100755 --- a/install-clara +++ b/install-clara @@ -61,6 +61,12 @@ function build_clara { cd clara-java && CLARA_HOME=$1 ./gradlew deploy && cd - } +function build_grapes { + #git clone --branch $grapes --depth 1 https://code.jlab.org/hallb/clas12/coatjava/grapes + git clone --depth 1 https://code.jlab.org/hallb/clas12/coatjava/grapes + cd grapes && mvn package && cd - +} + trap cleanup EXIT # Configure: @@ -142,6 +148,6 @@ cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12 # GRAPES: echo -e "\nRetrieving GRAPES version $grapes ..." -get https://clasweb.jlab.org/clas12offline/distribution/grapes/grapes-$grapes.tar.gz -mv grapes-$grapes clara-cre/plugins/grapes - +build_grapes $PWD/grapes +mkdir -p clara-cre/plugins/grapes/lib/core/ +cp grapes/target/grapes-*core*.jar clara-cre/plugins/grapes/lib/core/ From c59372ef93e401b1444aab02f9ca3e58d090521f Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 20 Nov 2025 12:15:22 -0500 Subject: [PATCH 4/4] use github instead of clasweb --- install-clara | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-clara b/install-clara index e66aad22e3..ec5d65f5f0 100755 --- a/install-clara +++ b/install-clara @@ -140,8 +140,8 @@ fi if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null then echo -e "\nRetrieving COATJAVA version $coatjava ..." - get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz - coatjava=./coatjava + get https://github.com/JeffersonLab/coatjava/releases/download/$coatjava/coatjava-$coatjava.tar.gz + coatjava=./coatjava-$coatjava fi mkdir -p clara-cre/plugins/clas12/config cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12