Skip to content

Commit f6e9931

Browse files
committed
feat(github):Add fairsoft version as input for the CI-CD tests
Added both versions of fairsoft for the nightly tests Added also the fairsoft version for clang-tidy Added OS and FSV to the CDash results
1 parent 510ce43 commit f6e9931

6 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/actions/ctest-cdash/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
run: |
2222
echo "TEST_MODEL=Experimental" >> $GITHUB_ENV
2323
export PULL_NR=${{ github.event.number }}
24-
echo "TEST_NAME=\"${{ inputs.repo }} (pull request No.${PULL_NR})\"" >> $GITHUB_ENV
24+
echo "TEST_NAME=\"${{ inputs.repo }}_${{ matrix.os }}_${{ matrix.fsv }} (pull request No.${PULL_NR})\"" >> $GITHUB_ENV
2525
shell: bash
2626

2727
- name: running ctest

.github/actions/pre-build/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ runs:
88
run: |
99
git config --global --add safe.directory $GITHUB_WORKSPACE
1010
echo "UCESB_DIR=$GITHUB_WORKSPACE/ucesb/" >> $GITHUB_ENV
11-
export SIMPATH=${CVMDIR}/${{ matrix.os }}/fairsoft/jan24p1
11+
export SIMPATH=${CVMDIR}/${{ matrix.os }}/fairsoft/${{ matrix.fsv }}
1212
echo "SIMPATH=${SIMPATH}" >> $GITHUB_ENV
13-
echo "FAIRROOTPATH=${CVMDIR}/${{ matrix.os }}/fairroot/v18.8.2_jan24p1" >> $GITHUB_ENV
13+
echo "FAIRROOTPATH=${CVMDIR}/${{ matrix.os }}/fairroot/v18.8.2_${{ matrix.fsv }}" >> $GITHUB_ENV
1414
echo "${SIMPATH}/bin" >> $GITHUB_PATH
1515
# variables for ccache
1616
echo "CCACHE_BASEDIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV

.github/workflows/main-nightly-sim.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ jobs:
6565
# Here are the groups of repositories that need to be downloaded inside
6666
# r3broot. Each group is used by only one job.
6767
repos: [ r3broot, glad-tpc, sofia-frs-asy ]
68-
os: [ debian10, debian11, debian12 ] # ubuntu24.04 ]
68+
os: [ debian11, debian12 ] # ubuntu24.04 ]
69+
fsv: [jan24p1, jan24p5]
6970

7071
# The list under "include" defines some properties for each group:
7172
#

.github/workflows/main-nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ jobs:
6565
# Here are the groups of repositories that need to be downloaded inside
6666
# r3broot. Each group is used by only one job.
6767
repos: [ r3broot, glad-tpc, sofia-frs-asy ]
68-
os: [ debian10, debian11, debian12 ] # ubuntu24.04 ]
68+
os: [ debian11, debian12 ] # ubuntu24.04 ]
69+
fsv: [jan24p1, jan24p5]
6970

7071
# The list under "include" defines some properties for each group:
7172
#

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
# r3broot. Each group is used by only one job.
9494
repos: [ r3broot, glad-tpc, sofia-frs-asy, r3broot-conan ]
9595
os: [ debian10, debian11, debian12 ]
96+
fsv: [jan24p1]
9697

9798
# The list under "include" defines some properties for each group:
9899
#

.github/workflows/static_analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
matrix:
3434
preset: [ default ]
3535
os: [ debian12 ]
36+
fsv: [jan24p1]
3637
container:
3738
image: yanzhaowang/cvmfs_clang:${{ matrix.os }}
3839
volumes:

0 commit comments

Comments
 (0)