Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed CI-CD compilation to jan24p1 #1079

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/actions/pre-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ runs:
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
echo "UCESB_DIR=$GITHUB_WORKSPACE/ucesb/" >> $GITHUB_ENV
export SIMPATH=${CVMDIR}/debian10/fairsoft/nov22p1
export SIMPATH=${CVMDIR}/debian10/fairsoft/jan24p1
echo "SIMPATH=${SIMPATH}" >> $GITHUB_ENV
echo "FAIRROOTPATH=${CVMDIR}/debian10/fairroot/v18.8.0_fs_nov22p1" >> $GITHUB_ENV
echo "FAIRROOTPATH=${CVMDIR}/debian10/fairroot/v18.8.2_jan24p1" >> $GITHUB_ENV
echo "${SIMPATH}/bin" >> $GITHUB_PATH
# variables for ccache
echo "CCACHE_BASEDIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/check_metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# SPDX-FileCopyrightText: 2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH, Darmstadt, Germany
#
# SPDX-License-Identifier: CC0-1.0

name: Check AUTHORS and CONTRIBUTORS in metadata

on:
push:
paths:
- AUTHORS
- CONTRIBUTORS
- codemeta.json
- .zenodo.json
pull_request:
paths:
- AUTHORS
- CONTRIBUTORS
- codemeta.json
- .zenodo.json

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Try updating metadata
run: python meta_update.py
- name: Check for Updates
run: git diff --exit-code
189 changes: 189 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
{
"creators": [
{
"name": "Al-Turany, Mohammad",
"orcid": "0000-0002-8071-4497"
},
{
"name": "Alvarez Pol, Hector",
"orcid": "0000-0001-9643-6252"
},
{
"name": "Heil, Michael"
},
{
"name": "Kresan, Dmytro",
"orcid": "0000-0002-7537-2875"
},
{
"name": "Mayer, Jan"
},
{
"name": "Rodriguez Sanchez, Jose Luis",
"orcid": "0000-0002-4702-5294"
},
{
"name": "Wagner, Vadim"
}
],
"contributors": [
{
"type": "Other",
"name": "Boretzky, Konstanze"
},
{
"type": "Other",
"name": "Cabanelas, Pablo"
},
{
"type": "Other",
"name": "Chatillon, Audrey"
},
{
"type": "Other",
"name": "Douma, Christiaan"
},
{
"type": "Other",
"name": "Falduto, Ashton"
},
{
"type": "Other",
"name": "Feijoo, Martina"
},
{
"type": "Other",
"name": "Galiana, Elisabet"
},
{
"type": "Other",
"name": "Garcia, Gabriel"
},
{
"type": "Other",
"name": "Gasparic, Igor"
},
{
"type": "Other",
"name": "Gra\u00f1a, Antia"
},
{
"type": "Other",
"name": "Johansson, H\u00e5kan"
},
{
"type": "Other",
"name": "Heiss, Benjamin"
},
{
"type": "Other",
"name": "Horvat, Andrea"
},
{
"type": "Other",
"name": "Inglessi, Alexander"
},
{
"type": "Other",
"name": "Kelic-Heil, Aleksandra"
},
{
"type": "Other",
"name": "Klenze, Philipp"
},
{
"type": "Other",
"name": "Kripko, Aron"
},
{
"type": "Other",
"name": "Kudaibergenova, Eleonora"
},
{
"type": "Other",
"name": "Labiche, Marc"
},
{
"type": "Other",
"name": "Lagni, Andrea"
},
{
"type": "Other",
"name": "Lihtar, Ivana"
},
{
"type": "Other",
"name": "Loeher, Bastian"
},
{
"type": "Other",
"name": "Milhomens da Fonseca, Leandro"
},
{
"type": "Other",
"name": "Mozumdar, Nikhil"
},
{
"type": "Other",
"name": "Panin, Valerii"
},
{
"type": "Other",
"name": "Plag, Ralf"
},
{
"type": "Other",
"name": "Ponnath, Lukas"
},
{
"type": "Other",
"name": "Rybalchenko, Alexey"
},
{
"type": "Other",
"name": "Storck, Sonja"
},
{
"type": "Other",
"name": "Syndikus, Ina"
},
{
"type": "Other",
"name": "Taniuchi, Ryo"
},
{
"type": "Other",
"name": "Tscheuschner, Joachim"
},
{
"type": "Other",
"name": "Wang, Yanzhao"
},
{
"type": "Other",
"name": "Whitehead, Matthew"
},
{
"type": "Other",
"name": "Wongel, Alicia"
},
{
"type": "Other",
"name": "Xarepe, Manuel"
},
{
"type": "Other",
"name": "Zanetti, Lorenzo"
}
],
"description": "The R3BRoot software is based on the FairRoot framework and can be used to perform Monte Carlo simulations and experimental data analysis of the R3B (Reactions with Relativistic Radioactive Beams) nuclear physics experiments at the GSI-FAIR research center (Facility for Antiproton and Ion Research). The user can create simulated data and/or perform analysis with the same framework. Geant3 and Geant4 transport engines are supported, however, the implemented tasks that create simulated data do not depend on a particular Monte Carlo engine. The framework delivers base classes which enable the users to construct their detectors and/or analysis tasks in a simple way, it also delivers some general functionality like track visualization. Moreover, an interface for reading experimental and/or simulated magnetic field maps is also implemented.",
"related_identifiers": [
{
"identifier": "https://github.com/R3BRootGroup/R3BRoot/",
"relation": "isSupplementTo",
"resource_type": "software",
"scheme": "url"
}
],
"title": "R3BRoot"
}
8 changes: 4 additions & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Al-Turany, Mohammad
Alvarez Pol, Hector
Al-Turany, Mohammad [https://orcid.org/0000-0002-8071-4497]
Alvarez Pol, Hector [https://orcid.org/0000-0001-9643-6252]
Heil, Michael
Kresan, Dmytro
Kresan, Dmytro [https://orcid.org/0000-0002-7537-2875]
Mayer, Jan
Rodriguez Sanchez, Jose Luis
Rodriguez Sanchez, Jose Luis [https://orcid.org/0000-0002-4702-5294]
Wagner, Vadim
1 change: 0 additions & 1 deletion CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ Whitehead, Matthew
Wongel, Alicia
Xarepe, Manuel
Zanetti, Lorenzo

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# R3BRoot Software [![license](https://alfa-ci.gsi.de/shields/badge/license-GPL--3.0-orange.svg)](COPYRIGHT)
# R3BRoot Software [![license](https://alfa-ci.gsi.de/shields/badge/license-GPL--3.0-orange.svg)](COPYRIGHT) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3896282.svg)](https://doi.org/10.5281/zenodo.12193515)

[![CI-CD](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main.yml) [![Static Analysis](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/static_analysis.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/static_analysis.yml) [![Validate Codemeta](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/codemeta_validate.yaml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/codemeta_validate.yaml) [![Cleanup Caches on PR Close](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/cleanup_cache.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/cleanup_cache.yml)

Expand Down
29 changes: 0 additions & 29 deletions califa/geobase/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,6 @@
# or submit itself to any jurisdiction. #
##############################################################################

if(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2019.11.geo.root")
message(STATUS "Starting to generate the standard root geometry v2019.11 for CALIFA")
execute_process(COMMAND root -l -q -x "${R3BROOT_SOURCE_DIR}/califa/geobase/create_califa_geo.C(1)")
message(STATUS "${BYellow}CALIFA standard root geometry v2019.11 has been created${CR} ")
else(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2019.11.geo.root")
message(STATUS "${BYellow}CALIFA standard root geometry v2019.11 already exists${CR} ")
endif(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2019.11.geo.root")

if(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2021.3.geo.root")
message(STATUS "Starting to generate the standard root geometry v2021.3 for CALIFA")
execute_process(COMMAND root -l -q -x "${R3BROOT_SOURCE_DIR}/califa/geobase/create_califa_geo.C(2)")
message(STATUS "${BYellow}CALIFA standard root geometry v2021.3 has been created${CR} ")
else(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2021.3.geo.root")
message(STATUS "${BYellow}CALIFA standard root geometry v2021.3 already exists${CR} ")
endif(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2021.3.geo.root")

if(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2024.1.geo.root")
message(STATUS "Starting to generate the standard root geometry v2024.1 for CALIFA")
execute_process(COMMAND root -l -q -x "${R3BROOT_SOURCE_DIR}/califa/geobase/create_califa_geo.C(3)")
message(STATUS "${BYellow}CALIFA standard root geometry v2024.1 has been created${CR} ")
else(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2024.1.geo.root")
message(STATUS "${BYellow}CALIFA standard root geometry v2024.1 already exists${CR} ")
endif(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_v2024.1.geo.root")

if(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_full.geo.root")
message(STATUS "Starting to generate the standard root geometry for CALIFA (FULL)")
Expand All @@ -42,9 +19,3 @@ message(STATUS "${BYellow}Full CALIFA standard root geometry has been created${C
else(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_full.geo.root")
message(STATUS "${BYellow}Full CALIFA standard root geometry already exists${CR} ")
endif(NOT EXISTS "${R3BROOT_SOURCE_DIR}/geometry/califa_full.geo.root")

generate_root_test_script(${R3BROOT_SOURCE_DIR}/califa/geobase/create_califa_geo.C)
add_test(NAME CalifaRootGeometry COMMAND ${R3BROOT_BINARY_DIR}/califa/geobase/create_califa_geo.sh)
set_tests_properties(CalifaRootGeometry PROPERTIES TIMEOUT "2000")
set_tests_properties(CalifaRootGeometry PROPERTIES PASS_REGULAR_EXPRESSION
"Macro finished successfully.")
26 changes: 18 additions & 8 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"contIntegration": "https://github.com/R3BRootGroup/R3BRoot/actions",
"dateCreated": "2009-04-14",
"datePublished": "2009-08-01",
"dateModified": "2023-11-04",
"downloadUrl": "https://github.com/R3BRootGroup/R3BRoot/archive/refs/tags/nov23.tar.gz",
"dateModified": "2024-12-05",
"downloadUrl": "https://github.com/R3BRootGroup/R3BRoot/archive/refs/tags/dec24.tar.gz",
"issueTracker": "https://github.com/R3BRootGroup/R3BRoot/issues",
"name": "R3BRoot",
"softwareVersion": "nov23",
"softwareVersion": "dec24",
"description": "Software for simulations and data analysis of Reactions with Relativistic Radioactive Beams experiment at FAIR",
"readme": "https://github.com/R3BRootGroup/R3BRoot/blob/dev/README.md",
"releaseNotes": "",
Expand Down Expand Up @@ -43,13 +43,15 @@
"maintainer": {
"@type": "Person",
"givenName": "Jose Luis",
"familyName": "Rodriguez Sanchez"
"familyName": "Rodriguez Sanchez",
"@id": "https://orcid.org/0000-0002-4702-5294"
},
"author": [
{
"@type": "Person",
"givenName": "Hector",
"familyName": "Alvarez Pol"
"familyName": "Alvarez Pol",
"@id": "https://orcid.org/0000-0001-9643-6252"
},
{
"@type": "Person",
Expand All @@ -59,7 +61,8 @@
{
"@type": "Person",
"givenName": "Dmytro",
"familyName": "Kresan"
"familyName": "Kresan",
"@id": "https://orcid.org/0000-0002-7537-2875"
},
{
"@type": "Person",
Expand All @@ -69,7 +72,8 @@
{
"@type": "Person",
"givenName": "Jose Luis",
"familyName": "Rodriguez Sanchez"
"familyName": "Rodriguez Sanchez",
"@id": "https://orcid.org/0000-0002-4702-5294"
},
{
"@type": "Person",
Expand All @@ -79,7 +83,8 @@
{
"@type": "Person",
"givenName": "Mohammad",
"familyName": "Al-Turany"
"familyName": "Al-Turany",
"@id": "https://orcid.org/0000-0002-8071-4497"
}
],
"contributor": [
Expand Down Expand Up @@ -248,6 +253,11 @@
"givenName": "Lorenzo",
"familyName": "Zanetti"
},
{
"@type": "Person",
"givenName": "Matthew",
"familyName": "Whitehead"
},
{
"@type": "Person",
"givenName": "Konstanze",
Expand Down
Loading
Loading