Merge remote-tracking branch 'origin/development' into dev-align3

.github/workflows/maven.yml

@@ -3,38 +3,152 @@
 name: Coatjava-CI
 
 on:
-  push:
-    branches: [ '**' ]
   pull_request:
-    branches: [ '**' ]
+  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 }}
+  cancel-in-progress: true
+
 jobs:
+
+  # build
+  #############################################################################
+
   build:
+    strategy:
+      fail-fast: true
+      matrix:
+        runner:
+          - ubuntu-latest
+          - macos-latest
+    outputs:
+      default_runner: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: zulu
+      - name: build
+        run: ./build-coatjava.sh --spotbugs --unittests --quiet -T4
+      - name: tar # tarball to preserve permissions
+        run: tar czvf coatjava.tar.gz coatjava
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build_${{ matrix.runner }}
+          retention-days: 1
+          path: coatjava.tar.gz
+      - name: collect jacoco report
+        if: ${{ matrix.runner == 'ubuntu-latest' }}
+        run: validation/jacoco-aggregate.sh
+      - name: publish jacoco report
+        if: ${{ matrix.runner == 'ubuntu-latest' }}
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: publish/
+          retention-days: 1
 
-    runs-on: ubuntu-latest
+  # tests
+  #############################################################################
 
+  test_coatjava:
+    needs: [ build ]
+    strategy:
+      fail-fast: true
+      matrix:
+        runner:
+          - ubuntu-latest
+        id:
+          - kpp
+          - eb-ep
+          - eb-eg
+          - eb-epc
+          - eb-enc
+          - eb-eftpi
+        include:
+          # run all tests on ubuntu
+          - { id: kpp,      cmd: ./run-advanced-tests.sh }
+          - { id: eb-ep,    cmd: ./run-eb-tests.sh -100 electronproton   }
+          - { id: eb-eg,    cmd: ./run-eb-tests.sh -100 electrongamma    }
+          - { id: eb-epc,   cmd: ./run-eb-tests.sh -100 electronprotonC  }
+          - { id: eb-enc,   cmd: ./run-eb-tests.sh -100 electronneutronC }
+          - { id: eb-eftpi, cmd: ./run-eb-tests.sh -100 electronFTpion   }
+          # run one macos test
+          - { runner: macos-latest, id: eb-ep, cmd: ./run-eb-tests.sh -100 electronproton }
+    runs-on: ${{ matrix.runner }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: build
-      run: ./build-coatjava.sh --spotbugs --unittests --quiet
-    - name: kpp-test
-      run: cd validation/advanced-tests && ./run-advanced-tests.sh
-    - name: eb-ep-test
-      run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronproton
-    - name: eb-eg-test
-      run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electrongamma
-    - name: eb-epc-test
-      run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronprotonC
-    - name: eb-enc-test
-      run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronneutronC
-    - name: eb-eftpi-test
-      run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronFTpion
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: zulu
+      - uses: actions/download-artifact@v4
+        with:
+          name: build_${{ matrix.runner }}
+      - name: untar build
+        run: tar xzvf coatjava.tar.gz
+      - name: run test
+        run: |
+          cd validation/advanced-tests
+          echo "COMMAND: ${{ matrix.cmd }}"
+          ${{ matrix.cmd }}
 
+  test_run-groovy:
+    needs: [ build ]
+    runs-on: ${{ needs.build.outputs.default_runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: zulu
+      - name: setup groovy
+        uses: wtfjoke/setup-groovy@v2
+        with:
+          groovy-version: 4.x
+      - uses: actions/download-artifact@v4
+        with:
+          name: build_${{ needs.build.outputs.default_runner }}
+      - name: untar build
+        run: tar xzvf coatjava.tar.gz
+      - name: test run-groovy
+        run: coatjava/bin/run-groovy validation/advanced-tests/test-run-groovy.groovy
+
+  final:
+    needs:
+      - build
+      - test_coatjava
+      - test_run-groovy
+    runs-on: ${{ needs.build.outputs.default_runner }}
+    steps:
+      - name: pass
+        run: exit 0
+
+  # deploy web pages
+  #############################################################################
+
+  deploy_web_pages:
+    if: ${{ github.event_name == 'push' }}
+    needs: build
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: deployment
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/validation.yml

@@ -0,0 +1,12 @@
+name: Validation
+
+on:
+  pull_request:
+  push:
+    branches: [ development ]
+    tags: [ '*' ]
+  workflow_dispatch:
+
+jobs:
+  validation:
+    uses: JeffersonLab/clas12-validation/.github/workflows/ci.yml@main

.gitignore

@@ -2,6 +2,7 @@
 /coatjava
 /myLocalMvnRepo
 target
+/publish
 
 *.class
 *lundfiles*.dat
@@ -36,4 +37,4 @@ hs_err_pid*
 *.evio 
 
 bin/evio2hipotest
-export.sh
+export.sh

.mailmap

@@ -37,9 +37,13 @@ Joseph Newton <[email protected]> <[email protected]>
 Justin Goodwill <[email protected]>
 Maxime Defurne <[email protected]>
 Michael Kunkel <[email protected]>
+Nathan Baltzell <[email protected]> <[email protected]>
+Nathan Baltzell <[email protected]> <[email protected]>
 Nathan Baltzell <[email protected]> <[email protected]>
 Nathan Baltzell <[email protected]> <[email protected]>
 Nathan Baltzell <[email protected]> <[email protected]>
+Nathan Baltzell <[email protected]> <[email protected]>
+Nathan Baltzell <[email protected]> <[email protected]>
 Nathan Harrison <[email protected]> <[email protected]>
 Nathan Harrison <[email protected]> <[email protected]>
 Nick Markov <[email protected]>

README.md

@@ -1,15 +1,29 @@
-# clas12-offline-software
-[![Build Status](https://github.com/jeffersonlab/clas12-offline-software/workflows/Coatjava-CI/badge.svg)](https://github.com/jeffersonlab/clas12-offline-software/actions)
-[![codecov](https://codecov.io/gh/JeffersonLab/clas12-offline-software/branch/development/graph/badge.svg?precision=2)](https://codecov.io/gh/JeffersonLab/clas12-offline-software/branch/development)
+# COATJAVA
+[![Build Status](https://github.com/jeffersonlab/coatjava/workflows/Coatjava-CI/badge.svg)](https://github.com/jeffersonlab/coatjava/actions)
+[![Validation Status](https://github.com/JeffersonLab/coatjava/actions/workflows/validation.yml/badge.svg)](https://github.com/JeffersonLab/coatjava/actions/workflows/validation.yml)
+[![Coverage](https://badgen.net/static/JaCoCo/coverage/purple)](https://jeffersonlab.github.io/coatjava)
 
+The original repository for COATJAVA was named "clas12-offline-software" and is [now archived and read-only](https://github.com/JeffersonLab/clas12-offline-software).  On May 17, 2023, this new repository was created by running BFG Repo Cleaner to get rid of old, large data files and things that should never have been in the repository, giving 10x reduction in repository size, clone time, etc, and renamed `coatjava`.  The most critical, GitHub-specific aspects have been transferred to this new repository:
 
-<!--## Quick Start-->
+* Open issues
+* Branch protection rules
+* User access permission
+
+But some things remain only in the original repository:
+
+* Release notes up to 9.0.1 (probably worth transferring)
+* Closed issues (probably not worth transferring)
+* Wiki (never really utilized and probably worth restarting from scratch)
+
+Due to the cleanup, previously existing forks and local copies of the old repository will not be automatically mergeable.
+
+----
 
 This README fell too far out of date and is undergoing resurrection.  Meanwhile, these bits are still relevant ...
 
-If you just want to use the software without modifying/building it, you can download a pre-built package from the [github releases](https://github.com/JeffersonLab/clas12-offline-software/releases) page or the corresponding repo at [JLab](https://clasweb.jlab.org/clas12offline/distribution/coatjava/).  Builds on JLab machines are also available, see the [general software wiki](https://clasweb.jlab.org/wiki/index.php/CLAS12_Software_Center) for setting up your environment to use them.
+If you just want to use the software without modifying/building it, you can download a pre-built package from the [GitHub releases](https://github.com/JeffersonLab/clas12-offline-software/releases) page or the corresponding repo at [JLab](https://clasweb.jlab.org/clas12offline/distribution/coatjava/).  Builds on JLab machines are also available, see the [general software wiki](https://clasweb.jlab.org/wiki/index.php/CLAS12_Software_Center) for setting up your environment to use them.
 
-For anything more, see the "General Developer Doucmentation" link on that software wiki, which points [here](https://clasweb.jlab.org/wiki/index.php/COATJAVA_Developer_Docs).
+For anything more, see the "General Developer Documentation" link on that software wiki, which points [here](https://clasweb.jlab.org/wiki/index.php/COATJAVA_Developer_Docs).
 
 The [troubleshooting](https://github.com/JeffersonLab/clas12-offline-software/wiki/Troubleshooting) wiki page may also still be useful but likely outdated.