Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9a4d09f
New test branch
jonzarling Apr 15, 2025
01f793b
Attempting to resurrect the maven build
jonzarling Apr 16, 2025
5ca8663
Trying out new pom.xml. Seems to work (on my machine...)
jonzarling Apr 17, 2025
01c332c
Change jar dir, fix maven warning
jonzarling Apr 17, 2025
8821c67
Build tweaks, add test programs
jonzarling Apr 21, 2025
18446e3
More work on tutorials
jonzarling Apr 23, 2025
92d11f0
More progress on tests
jonzarling Apr 24, 2025
563cd4b
More additions to helper class
jonzarling Apr 25, 2025
9f2fe18
now helper class works
jonzarling Apr 25, 2025
4aad9fb
Add EventBuilder and CompactEventBuilder tests
jonzarling Apr 28, 2025
a6bc261
Update compact writer test
jonzarling Apr 29, 2025
3ac628d
working on fix
jonzarling Apr 29, 2025
637e27f
First-pass skeleton of CLAS file reader
jonzarling May 1, 2025
9701401
Some cleanup to CMakeLists.txt, shouldn't change any default behavior
jonzarling May 15, 2025
7253b5f
When reading evio6 data, add check to file header to skip HIPO format…
jonzarling May 15, 2025
5f9401c
Add check to reject HIPO files from evio6 Reader/CompactReader, for C…
jonzarling May 16, 2025
f10f845
add colz defs
jonzarling May 19, 2025
6951312
Adding warning that scons support will be removed. For now scons will…
jonzarling May 19, 2025
fbcbe45
Small clarification to change log
jonzarling May 19, 2025
a3698b7
Add local disruptor jar (updated for evio-6) that mvn will prefer & c…
jonzarling May 21, 2025
1ad636a
Merge branch 'evio-6-dev' of ssh://github.com/JeffersonLab/evio
jonzarling May 21, 2025
4eba858
Comment out hipo header check for now, cleanup pom.xml
jonzarling May 21, 2025
6547765
Now mvn installs correct jar too, previously had been getting overridden
jonzarling May 21, 2025
87bf27a
cleanup: remove old file and merge helper functions into SConstruct file
jonzarling May 21, 2025
f883dbb
cosmetic tweaks to pom file
jonzarling May 22, 2025
862e9eb
minor tweaks to pom (will also fix conflict on my 2nd local machine)
jonzarling May 22, 2025
2888413
addd missing import to scons
jonzarling May 23, 2025
7f73d2d
More cleanup: move unused files to new etc/ directory
jonzarling May 23, 2025
cab5c82
Change directory structure of c/c++ test programs (likely will move o…
jonzarling May 25, 2025
155b61d
Move java tests to historical `etc/` folder
jonzarling May 30, 2025
a6a6125
Add JUnit dependency and a first dummy example (borrowed from junit5-…
jonzarling May 30, 2025
03bf0bb
Add workflow action for testing java components
jonzarling Jun 2, 2025
6678580
Hopefully this helps it trigger
jonzarling Jun 2, 2025
df1ad43
Add init c/c++ testing workflow (and little fix on java one)
jonzarling Jun 2, 2025
57f28ef
Move java lib to standard maven-style directory src/main/java
jonzarling Jun 2, 2025
55ee186
More cleanup: move jars, add additional READMEs
jonzarling Jun 2, 2025
072df68
Move c++ tutorials to subfolder
jonzarling Jun 2, 2025
d85d588
Move Carl's tests to `etc/` folder, add init tests that will supercede
jonzarling Jun 6, 2025
30165a4
Fix pom file, add helper java class for unit tests
jonzarling Jun 6, 2025
a3249a9
Now java test can at least write to file
jonzarling Jun 6, 2025
7d9fb88
Move etc/ files to proper java directory format.
jonzarling Jun 9, 2025
4bdfbce
Move files, change file names
jonzarling Jun 9, 2025
e115793
Fix a really nasty memory leak due to shared pointers getting stuck i…
jonzarling Jun 10, 2025
6dcf5da
Tweak tests; fix nullptr to proper value so code compiles again after…
jonzarling Jun 11, 2025
5342303
Add another test program to debug
jonzarling Jun 11, 2025
17555d4
Revert debugging output code, no longer needed. Add more extensions t…
jonzarling Jun 13, 2025
985d3cf
minor tweaks to tests
jonzarling Jun 22, 2025
ba93797
more small junit tweaks
jonzarling Jun 23, 2025
3737088
more tweaks
jonzarling Jun 25, 2025
5957355
Starting work on a "recovery" feature, to look nearby for magic word …
jonzarling Jun 25, 2025
c54583a
Add addHeaderRecoveryCheck() function to Java API allowing for recove…
jonzarling Jun 27, 2025
943a7cb
More cleanup and typos, getting ready for next version release
jonzarling Jul 7, 2025
fc67077
Revert spacings back to old file; prevent (deceptively) large diff
jonzarling Jul 7, 2025
62aea6b
Update readme and CMakeLists.txt files, remove old
jonzarling Jul 8, 2025
9e36009
Note about scons for the readme
jonzarling Jul 8, 2025
070cc94
Merge branch 'main' into evio-6-dev
jonzarling Jul 8, 2025
69d8a7e
Update c_tests.yml
jonzarling Jul 8, 2025
c8728a5
Fix debug postfix so github actions work
jonzarling Jul 8, 2025
72bbdf4
Fix directory path for unit test output
jonzarling Jul 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/c_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "C/C++ Tests"
on:
pull_request:
branches: [ main ]

jobs:
cpp_test:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y cmake build-essential libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev liblz4-dev doxygen

- name: Configure CMake
run: cmake -S . -B build -DMAKE_EXAMPLES=1

- name: Build
run: cmake --build build -- -j$(nproc)

- name: Run tests
working-directory: build
run: ctest --output-on-failure
30 changes: 30 additions & 0 deletions .github/workflows/java_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Java Tests (EVIO-6)

on:
pull_request:
branches: [ main ]

jobs:
java_test:
name: Run JUnit Tests
runs-on: ubuntu-latest
container:
image: maven:3.9-eclipse-temurin-17-alpine

steps:
- name: Check out code
uses: actions/checkout@v3

# Uncomment to set up Java and Maven manually, if desired
# # (and probably comment out the container image above)
# - name: Set up JDK 17
# uses: actions/setup-java@v3
# with:
# distribution: temurin
# java-version: 17
# Install maven by hand (if not in container image)
# - name: Maven Setup
# run: sudo apt-get update && apt-get install -y maven

- name: Build and run tests
run: mvn --batch-mode test
19 changes: 18 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,38 @@
.*
# ignore all files/dirs beginning with _
_*
# EventViewer Jar
JEventViewer*.jar

# except these two
!.gitignore
!.github/

# ignore any .evio, .ev, or .hipo extension files (+ other common file types)
*.evio*
*.ev
*.hipo
*.dat
*.txt
*.out.*
perf.data*

# test programs to ignore
src/main/java/org/jlab/coda/jevio/dev/*

# ignore generated files/dirs
cmake-*
cmake_install.cmake
coda.pyc
build/
jbuild/
lib/
bin/
doxyerrors.log
/target/
target/
doc/javadoc
doc/doxygen/CC
doc/doxygen/C
doc/source/
config.log

Loading