Skip to content

Commit 86fbc53

Browse files
committed
Merge remote-tracking branch 'origin/development' into dev-align3
2 parents f725fa3 + fd1ea15 commit 86fbc53

File tree

1,472 files changed

+109836
-84744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,472 files changed

+109836
-84744
lines changed

.codecov.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows/maven.yml

Lines changed: 137 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,152 @@
33
name: Coatjava-CI
44

55
on:
6-
push:
7-
branches: [ '**' ]
86
pull_request:
9-
branches: [ '**' ]
7+
push:
8+
branches: [ development ]
9+
tags: [ '*' ]
1010
schedule:
1111
# NOTE: From what I read, the email notification for cron can only go
1212
# to the last committer of this file!!!!!
1313
- cron: '0 22 * * *'
1414

15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
1519
jobs:
20+
21+
# build
22+
#############################################################################
23+
1624
build:
25+
strategy:
26+
fail-fast: true
27+
matrix:
28+
runner:
29+
- ubuntu-latest
30+
- macos-latest
31+
outputs:
32+
default_runner: ubuntu-latest
33+
runs-on: ${{ matrix.runner }}
34+
steps:
35+
- uses: actions/checkout@v4
36+
- name: Set up JDK
37+
uses: actions/setup-java@v4
38+
with:
39+
java-version: 11
40+
distribution: zulu
41+
- name: build
42+
run: ./build-coatjava.sh --spotbugs --unittests --quiet -T4
43+
- name: tar # tarball to preserve permissions
44+
run: tar czvf coatjava.tar.gz coatjava
45+
- uses: actions/upload-artifact@v4
46+
with:
47+
name: build_${{ matrix.runner }}
48+
retention-days: 1
49+
path: coatjava.tar.gz
50+
- name: collect jacoco report
51+
if: ${{ matrix.runner == 'ubuntu-latest' }}
52+
run: validation/jacoco-aggregate.sh
53+
- name: publish jacoco report
54+
if: ${{ matrix.runner == 'ubuntu-latest' }}
55+
uses: actions/upload-pages-artifact@v3
56+
with:
57+
path: publish/
58+
retention-days: 1
1759

18-
runs-on: ubuntu-latest
60+
# tests
61+
#############################################################################
1962

63+
test_coatjava:
64+
needs: [ build ]
65+
strategy:
66+
fail-fast: true
67+
matrix:
68+
runner:
69+
- ubuntu-latest
70+
id:
71+
- kpp
72+
- eb-ep
73+
- eb-eg
74+
- eb-epc
75+
- eb-enc
76+
- eb-eftpi
77+
include:
78+
# run all tests on ubuntu
79+
- { id: kpp, cmd: ./run-advanced-tests.sh }
80+
- { id: eb-ep, cmd: ./run-eb-tests.sh -100 electronproton }
81+
- { id: eb-eg, cmd: ./run-eb-tests.sh -100 electrongamma }
82+
- { id: eb-epc, cmd: ./run-eb-tests.sh -100 electronprotonC }
83+
- { id: eb-enc, cmd: ./run-eb-tests.sh -100 electronneutronC }
84+
- { id: eb-eftpi, cmd: ./run-eb-tests.sh -100 electronFTpion }
85+
# run one macos test
86+
- { runner: macos-latest, id: eb-ep, cmd: ./run-eb-tests.sh -100 electronproton }
87+
runs-on: ${{ matrix.runner }}
2088
steps:
21-
- uses: actions/checkout@v2
22-
- name: Set up JDK
23-
uses: actions/setup-java@v1
24-
with:
25-
java-version: 11
26-
- name: build
27-
run: ./build-coatjava.sh --spotbugs --unittests --quiet
28-
- name: kpp-test
29-
run: cd validation/advanced-tests && ./run-advanced-tests.sh
30-
- name: eb-ep-test
31-
run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronproton
32-
- name: eb-eg-test
33-
run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electrongamma
34-
- name: eb-epc-test
35-
run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronprotonC
36-
- name: eb-enc-test
37-
run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronneutronC
38-
- name: eb-eftpi-test
39-
run: cd validation/advanced-tests && ./run-eb-tests.sh -100 electronFTpion
89+
- uses: actions/checkout@v4
90+
- name: Set up JDK
91+
uses: actions/setup-java@v4
92+
with:
93+
java-version: 11
94+
distribution: zulu
95+
- uses: actions/download-artifact@v4
96+
with:
97+
name: build_${{ matrix.runner }}
98+
- name: untar build
99+
run: tar xzvf coatjava.tar.gz
100+
- name: run test
101+
run: |
102+
cd validation/advanced-tests
103+
echo "COMMAND: ${{ matrix.cmd }}"
104+
${{ matrix.cmd }}
40105
106+
test_run-groovy:
107+
needs: [ build ]
108+
runs-on: ${{ needs.build.outputs.default_runner }}
109+
steps:
110+
- uses: actions/checkout@v4
111+
- name: Set up JDK
112+
uses: actions/setup-java@v4
113+
with:
114+
java-version: 11
115+
distribution: zulu
116+
- name: setup groovy
117+
uses: wtfjoke/setup-groovy@v2
118+
with:
119+
groovy-version: 4.x
120+
- uses: actions/download-artifact@v4
121+
with:
122+
name: build_${{ needs.build.outputs.default_runner }}
123+
- name: untar build
124+
run: tar xzvf coatjava.tar.gz
125+
- name: test run-groovy
126+
run: coatjava/bin/run-groovy validation/advanced-tests/test-run-groovy.groovy
127+
128+
final:
129+
needs:
130+
- build
131+
- test_coatjava
132+
- test_run-groovy
133+
runs-on: ${{ needs.build.outputs.default_runner }}
134+
steps:
135+
- name: pass
136+
run: exit 0
137+
138+
# deploy web pages
139+
#############################################################################
140+
141+
deploy_web_pages:
142+
if: ${{ github.event_name == 'push' }}
143+
needs: build
144+
permissions:
145+
pages: write
146+
id-token: write
147+
environment:
148+
name: github-pages
149+
url: ${{ steps.deployment.outputs.page_url }}
150+
runs-on: ubuntu-latest
151+
steps:
152+
- name: deployment
153+
id: deployment
154+
uses: actions/deploy-pages@v4

.github/workflows/validation.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Validation
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [ development ]
7+
tags: [ '*' ]
8+
workflow_dispatch:
9+
10+
jobs:
11+
validation:
12+
uses: JeffersonLab/clas12-validation/.github/workflows/ci.yml@main

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/coatjava
33
/myLocalMvnRepo
44
target
5+
/publish
56

67
*.class
78
*lundfiles*.dat
@@ -36,4 +37,4 @@ hs_err_pid*
3637
*.evio
3738

3839
bin/evio2hipotest
39-
export.sh
40+
export.sh

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ Joseph Newton <[email protected]> <[email protected]>
3737
Justin Goodwill <[email protected]>
3838
Maxime Defurne <[email protected]>
3939
Michael Kunkel <[email protected]>
40+
41+
4042
4143
4244
45+
46+
4347
4448
4549
Nick Markov <[email protected]>

README.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
1-
# clas12-offline-software
2-
[![Build Status](https://github.com/jeffersonlab/clas12-offline-software/workflows/Coatjava-CI/badge.svg)](https://github.com/jeffersonlab/clas12-offline-software/actions)
3-
[![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)
1+
# COATJAVA
2+
[![Build Status](https://github.com/jeffersonlab/coatjava/workflows/Coatjava-CI/badge.svg)](https://github.com/jeffersonlab/coatjava/actions)
3+
[![Validation Status](https://github.com/JeffersonLab/coatjava/actions/workflows/validation.yml/badge.svg)](https://github.com/JeffersonLab/coatjava/actions/workflows/validation.yml)
4+
[![Coverage](https://badgen.net/static/JaCoCo/coverage/purple)](https://jeffersonlab.github.io/coatjava)
45

6+
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:
57

6-
<!--## Quick Start-->
8+
* Open issues
9+
* Branch protection rules
10+
* User access permission
11+
12+
But some things remain only in the original repository:
13+
14+
* Release notes up to 9.0.1 (probably worth transferring)
15+
* Closed issues (probably not worth transferring)
16+
* Wiki (never really utilized and probably worth restarting from scratch)
17+
18+
Due to the cleanup, previously existing forks and local copies of the old repository will not be automatically mergeable.
19+
20+
----
721

822
This README fell too far out of date and is undergoing resurrection. Meanwhile, these bits are still relevant ...
923

10-
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.
24+
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.
1125

12-
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).
26+
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).
1327

1428
The [troubleshooting](https://github.com/JeffersonLab/clas12-offline-software/wiki/Troubleshooting) wiki page may also still be useful but likely outdated.
1529

bin.old/calibration

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)