Skip to content

Commit c838b53

Browse files
c-dilksc-dilks
committed
Merge branch 'development' @ c86a484e856eb6822c68890ec72af776e31affd5 into dev-align3
2 parents 9c4b215 + c86a484 commit c838b53

File tree

288 files changed

+9923
-5907
lines changed

Some content is hidden

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

288 files changed

+9923
-5907
lines changed

‎.containers/coatjava.Dockerfile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#syntax=docker/dockerfile:1
2+
3+
FROM ubuntu:noble
4+
5+
LABEL name="coatjava"
6+
LABEL maintainer="Whitney Armstrong <[email protected]>"
7+
LABEL architecture="amd64"
8+
9+
USER root
10+
11+
12+
RUN apt update && apt upgrade -y
13+
RUN apt install cmake vim maven groovy git ca-certificates wget curl python-is-python3 \
14+
openjdk-17-jdk openjdk-17-jre openjdk-17-jdk-headless openjdk-17-jre-headless \
15+
python3-sqlalchemy -y && update-ca-certificates
16+
17+
# CA certificates
18+
ADD https://pki.jlab.org/JLabCA.crt /etc/ssl/certs/JLabCA.crt
19+
#RUN trust anchor --store /image/JLabCA.crt
20+
21+
ARG REF_NAME=development
22+
# build coatjava
23+
RUN java --version && cd /opt && \
24+
git clone https://code.jlab.org/hallb/alert/coatjava.git && cd coatjava && \
25+
git fetch origin && git checkout ${REF_NAME} && ./build-coatjava.sh

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
ignore:
8+
- dependency-name: "org.jlab:groot" # since version numbers are not in order
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "weekly"

‎.github/workflows/maven.yml‎

Lines changed: 66 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ concurrency:
1616
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1717
cancel-in-progress: true
1818

19+
defaults:
20+
run:
21+
shell: bash
22+
23+
env:
24+
java_version: 17
25+
java_distribution: zulu
26+
groovy_version: 4.x
27+
1928
jobs:
2029

2130
# build
@@ -28,16 +37,14 @@ jobs:
2837
runner:
2938
- ubuntu-latest
3039
- macos-latest
31-
outputs:
32-
default_runner: ubuntu-latest
3340
runs-on: ${{ matrix.runner }}
3441
steps:
3542
- uses: actions/checkout@v4
3643
- name: Set up JDK
3744
uses: actions/setup-java@v4
3845
with:
39-
java-version: 11
40-
distribution: zulu
46+
java-version: ${{ env.java_version }}
47+
distribution: ${{ env.java_distribution }}
4148
- name: build
4249
run: ./build-coatjava.sh --spotbugs --unittests --quiet -T4
4350
- name: tar # tarball to preserve permissions
@@ -52,8 +59,9 @@ jobs:
5259
run: validation/jacoco-aggregate.sh
5360
- name: publish jacoco report
5461
if: ${{ matrix.runner == 'ubuntu-latest' }}
55-
uses: actions/upload-pages-artifact@v3
62+
uses: actions/upload-artifact@v4
5663
with:
64+
name: jacoco_report
5765
path: publish/
5866
retention-days: 1
5967

@@ -90,8 +98,8 @@ jobs:
9098
- name: Set up JDK
9199
uses: actions/setup-java@v4
92100
with:
93-
java-version: 11
94-
distribution: zulu
101+
java-version: ${{ env.java_version }}
102+
distribution: ${{ env.java_distribution }}
95103
- uses: actions/download-artifact@v4
96104
with:
97105
name: build_${{ matrix.runner }}
@@ -105,21 +113,21 @@ jobs:
105113
106114
test_run-groovy:
107115
needs: [ build ]
108-
runs-on: ${{ needs.build.outputs.default_runner }}
116+
runs-on: ubuntu-latest
109117
steps:
110118
- uses: actions/checkout@v4
111119
- name: Set up JDK
112120
uses: actions/setup-java@v4
113121
with:
114-
java-version: 11
115-
distribution: zulu
122+
java-version: ${{ env.java_version }}
123+
distribution: ${{ env.java_distribution }}
116124
- name: setup groovy
117125
uses: wtfjoke/setup-groovy@v2
118126
with:
119-
groovy-version: 4.x
127+
groovy-version: ${{ env.groovy_version }}
120128
- uses: actions/download-artifact@v4
121129
with:
122-
name: build_${{ needs.build.outputs.default_runner }}
130+
name: build_ubuntu-latest
123131
- name: untar build
124132
run: tar xzvf coatjava.tar.gz
125133
- name: test run-groovy
@@ -130,17 +138,60 @@ jobs:
130138
- build
131139
- test_coatjava
132140
- test_run-groovy
133-
runs-on: ${{ needs.build.outputs.default_runner }}
141+
runs-on: ubuntu-latest
134142
steps:
135143
- name: pass
136144
run: exit 0
137145

146+
# generate documentation
147+
#############################################################################
148+
149+
generate_documentation:
150+
runs-on: ubuntu-latest
151+
steps:
152+
- uses: actions/checkout@v4
153+
- name: Set up JDK
154+
uses: actions/setup-java@v4
155+
with:
156+
java-version: ${{ env.java_version }}
157+
distribution: ${{ env.java_distribution }}
158+
- name: build
159+
run: ./build-coatjava.sh
160+
- name: generate documentation
161+
run: ./build-javadocs.sh
162+
- uses: actions/upload-artifact@v4
163+
with:
164+
name: javadoc
165+
path: docs/javadoc/
166+
retention-days: 1
167+
138168
# deploy web pages
139169
#############################################################################
140170

171+
collect_webpages:
172+
if: ${{ github.ref == 'refs/heads/development' }}
173+
needs: [ build, generate_documentation ]
174+
runs-on: ubuntu-latest
175+
steps:
176+
- name: download jacoco report
177+
uses: actions/download-artifact@v4
178+
with:
179+
name: jacoco_report
180+
path: pages/jacoco
181+
- name: download javadoc documentation
182+
uses: actions/download-artifact@v4
183+
with:
184+
name: javadoc
185+
path: pages/javadoc
186+
- run: tree pages
187+
- uses: actions/upload-pages-artifact@v3
188+
with:
189+
retention-days: 1
190+
path: pages/
191+
141192
deploy_web_pages:
142-
if: ${{ github.event_name == 'push' }}
143-
needs: build
193+
if: ${{ github.ref == 'refs/heads/development' }}
194+
needs: collect_webpages
144195
permissions:
145196
pages: write
146197
id-token: write

‎.github/workflows/validation.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,17 @@ on:
1010
jobs:
1111
validation:
1212
uses: JeffersonLab/clas12-validation/.github/workflows/ci.yml@main
13+
with:
14+
matrix_evgen: >-
15+
[
16+
"e_p",
17+
"e_n",
18+
"e_g",
19+
"e_pC",
20+
"eFT_K",
21+
"e_gFT"
22+
]
23+
matrix_config: >-
24+
[
25+
"rgb_fall2019"
26+
]

‎.gitlab-ci.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
workflow:
2+
rules:
3+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
4+
- if: '$CI_PIPELINE_SOURCE == "web"'
5+
- if: '$CI_PIPELINE_SOURCE == "webide"'
6+
- if: '$CI_COMMIT_BRANCH == "master"'
7+
- if: '$CI_COMMIT_BRANCH == "development"'
8+
- if: '$CI_COMMIT_TAG'
9+
10+
default:
11+
image: ubuntu:noble
12+
retry: 2
13+
14+
coatjava_build:
15+
image: gcr.io/kaniko-project/executor:debug
16+
script:
17+
- echo "${CI_COMMIT_REF_NAME}"
18+
- >-
19+
/kaniko/executor
20+
--context $CI_PROJECT_DIR/docker
21+
--dockerfile $CI_PROJECT_DIR/.containers/coatjava.Dockerfile
22+
--destination $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME}
23+
--build-arg REF_NAME=${CI_COMMIT_REF_NAME}
24+
25+
alert_testing:
26+
needs: ["coatjava_build"]
27+
variables:
28+
REF_NAME: "$CI_COMMIT_REF_NAME"
29+
trigger:
30+
project: hallb/alert/c12
31+
strategy: depend
32+
33+
shared_for_alert_tests:
34+
needs: ["coatjava_build"]
35+
variables:
36+
REF_NAME: "$CI_COMMIT_REF_NAME"
37+
trigger:
38+
project: hallb/alert/atof/shared_for_alert
39+
strategy: depend
40+

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# COATJAVA
22
[![Build Status](https://github.com/jeffersonlab/coatjava/workflows/Coatjava-CI/badge.svg)](https://github.com/jeffersonlab/coatjava/actions)
33
[![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)
4+
[![Coverage](https://badgen.net/static/JaCoCo/coverage/purple)](https://jeffersonlab.github.io/coatjava/jacoco)
5+
6+
- [API Documentation (Javadoc)](https://jeffersonlab.github.io/coatjava/javadoc)
7+
8+
----
59

610
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:
711

@@ -27,8 +31,6 @@ For anything more, see the "General Developer Documentation" link on that softwa
2731

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

30-
<!--Javadocs can be found at the repository's [gh-page](https://jeffersonlab.github.io/clas12-offline-software/). A build history can be found at [Travis CI](https://travis-ci.org/JeffersonLab/clas12-offline-software).-->
31-
3234
<!--
3335
## Repository Structure and Dependency Management
3436
### Common Tools

‎bin/bg-merger‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
. `dirname $0`/env.sh
3+
. `dirname $0`/../libexec/env.sh
44

55
export MALLOC_ARENA_MAX=1
66

‎bin/bos2hipo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
. `dirname $0`/env.sh
3+
. `dirname $0`/../libexec/env.sh
44

55
java -Xms1024m -XX:+UseSerialGC \
66
-cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

‎bin/cvt-compare‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
. `dirname $0`/env.sh
3+
. `dirname $0`/../libexec/env.sh
44

55
export MALLOC_ARENA_MAX=1
66

‎bin/daqEventViewer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
. `dirname $0`/env.sh
3+
. `dirname $0`/../libexec/env.sh
44

55
java -Xms1024m \
66
-cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \

0 commit comments

Comments
 (0)