diff --git a/.github/workflows/documentation.yml b/.github/workflows/build_documentation.yml similarity index 98% rename from .github/workflows/documentation.yml rename to .github/workflows/build_documentation.yml index 118b0770b..4bdfd95cd 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/build_documentation.yml @@ -1,4 +1,4 @@ -name: Documentation generation +name: Build documentation on: push: diff --git a/.github/workflows/ccpp-epscimac.yml b/.github/workflows/ccpp-epscimac.yml deleted file mode 100644 index 0e0201920..000000000 --- a/.github/workflows/ccpp-epscimac.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: C/C++ CI epscimac server - -on: - push: - branches: [ cissie_ci ] - pull_request: - branches: [ cissie_ci ] - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - build-n-install-jana: - # matching the label to corresponding self-hosted runner - runs-on: [self-hosted, macOS, ARM64] - # Run cmake, make, and make install as separate steps - # Note that every step starts out in the $GITHUB_WORKSPACE directory. - steps: - - uses: actions/checkout@v3 -# - name: show path -# run: | -# echo $GITHUB_WORKSPACE # /Users/xmei/actions-runners/_work/JANA2/JANA2 - - name: cmake configure - run: | - export PATH=/opt/homebrew/bin:$PATH - which cmake - mkdir -p $GITHUB_WORKSPACE/build - cd $GITHUB_WORKSPACE/build - cmake ../ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/Darwin -DUSE_ROOT=Off - - name: make - run: | - cd $GITHUB_WORKSPACE/build - make - - name: make install - run: | - cd $GITHUB_WORKSPACE/build - make install - # depends on build-n-install-jana - run-jtest-plugin: - runs-on: [ self-hosted, macOS ] - needs: build-n-install-jana - steps: - - name: run jtest plugin - run: | - export JANA_PLUGIN_PATH=$GITHUB_WORKSPACE/Darwin/plugins - ls $JANA_PLUGIN_PATH - $GITHUB_WORKSPACE/Darwin/bin/jana -PPLUGINS=JTest -Pjana:nevents=100 - run-jana-tests: - runs-on: [ self-hosted, macOS ] - needs: build-n-install-jana - steps: - - name: run jana tests - run: $GITHUB_WORKSPACE/Darwin/bin/jana-unit-tests diff --git a/.github/workflows/ccpp-docker.yml b/.github/workflows/test_dependency_matrix.yml similarity index 98% rename from .github/workflows/ccpp-docker.yml rename to .github/workflows/test_dependency_matrix.yml index bc766e52b..f108ce54d 100644 --- a/.github/workflows/ccpp-docker.yml +++ b/.github/workflows/test_dependency_matrix.yml @@ -1,4 +1,4 @@ -name: C/C++ CI docker +name: Dependency matrix tests on: push: diff --git a/.github/workflows/eicshell.yml b/.github/workflows/test_integration_epic.yml similarity index 99% rename from .github/workflows/eicshell.yml rename to .github/workflows/test_integration_epic.yml index aea6d9732..e28882092 100644 --- a/.github/workflows/eicshell.yml +++ b/.github/workflows/test_integration_epic.yml @@ -1,5 +1,5 @@ -name: eic-shell +name: Integration tests - ePIC on: push: diff --git a/.github/workflows/halld_recon.yml b/.github/workflows/test_integration_gluex.yml similarity index 97% rename from .github/workflows/halld_recon.yml rename to .github/workflows/test_integration_gluex.yml index 19b3aaffd..21fb50024 100644 --- a/.github/workflows/halld_recon.yml +++ b/.github/workflows/test_integration_gluex.yml @@ -1,4 +1,4 @@ -name: halld_recon +name: Integration tests - GlueX on: push: diff --git a/.github/workflows/cuda-farm.yml b/.github/workflows/test_platform_farm_cuda.yml similarity index 96% rename from .github/workflows/cuda-farm.yml rename to .github/workflows/test_platform_farm_cuda.yml index ee5971b4c..7e18c5449 100644 --- a/.github/workflows/cuda-farm.yml +++ b/.github/workflows/test_platform_farm_cuda.yml @@ -1,4 +1,4 @@ -name: CUDA CI farm +name: Platform tests - Farm+CUDA # disable this one by naming an invalid branch on: diff --git a/.github/workflows/ccpp-macos.yml b/.github/workflows/test_platform_mac.yml similarity index 97% rename from .github/workflows/ccpp-macos.yml rename to .github/workflows/test_platform_mac.yml index fef7072e1..b9799aa88 100644 --- a/.github/workflows/ccpp-macos.yml +++ b/.github/workflows/test_platform_mac.yml @@ -1,4 +1,4 @@ -name: C/C++ CI macOS-latest +name: Platform tests - macOS on: push: diff --git a/.github/workflows/ccpp-linux.yml b/.github/workflows/test_platform_ubuntu.yml similarity index 98% rename from .github/workflows/ccpp-linux.yml rename to .github/workflows/test_platform_ubuntu.yml index 6c082fe9b..c0b4a4d76 100644 --- a/.github/workflows/ccpp-linux.yml +++ b/.github/workflows/test_platform_ubuntu.yml @@ -1,4 +1,4 @@ -name: C/C++ CI ubuntu +name: Platform tests - Ubuntu on: push: diff --git a/.github/workflows/trigger-gitlab.yml b/.github/workflows/trigger-gitlab.yml index 0fbbf1e1a..334d22ca4 100644 --- a/.github/workflows/trigger-gitlab.yml +++ b/.github/workflows/trigger-gitlab.yml @@ -1,4 +1,4 @@ -name: trigger-gitlab +name: Trigger GitLab on: push: branches: [master] diff --git a/README.md b/README.md index 013b49f3d..a22f43664 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,20 @@ -![C/C++ CI ubuntu](https://github.com/JeffersonLab/JANA2/actions/workflows/ccpp-linux.yml/badge.svg)
-![C/C++ CI docker](https://github.com/JeffersonLab/JANA2/actions/workflows/ccpp-docker.yml/badge.svg)
-![C/C++ CI macos](https://github.com/JeffersonLab/JANA2/actions/workflows/ccpp-macos.yml/badge.svg)
-![C/C++ CI cuda-ifarm](https://github.com/JeffersonLab/JANA2/actions/workflows/cuda-farm.yml/badge.svg)
+ + +![Dependency matrix tests](https://github.com/JeffersonLab/JANA2/actions/workflows/test_dependency_matrix.yml/badge.svg) + +
+ +![ePIC integration tests](https://github.com/JeffersonLab/JANA2/actions/workflows/test_integration_epic.yml/badge.svg) + +
+ +![GlueX integration tests](https://github.com/JeffersonLab/JANA2/actions/workflows/test_integration_gluex.yml/badge.svg) +
[![DOI](https://zenodo.org/badge/117695469.svg)](https://zenodo.org/badge/latestdoi/117695469) ## Welcome to JANA! -JANA is a C++ framework for multi-threaded HENP (High Energy and Nuclear Physics) event reconstruction. +JANA is a C++ framework for multi-threaded HENP (High Energy and Nuclear Physics) event reconstruction. Please see the [JANA website](https://jeffersonlab.github.io/JANA2/) for full documentation. JANA2 is a complete rewrite retaining successful features from the original while modernizing the framework for a new generation of experiments. The code is under active development, but is ready for use as is. You are welcome to