Skip to content

Commit 4622156

Browse files
committed
feat(github):Add debian13 for CI tests
Change imagen for docker Update fairsoft version for static_analysis.yml
1 parent 369c669 commit 4622156

4 files changed

Lines changed: 23 additions & 9 deletions

File tree

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,17 @@ runs:
1414
echo "FAIRROOTPATH=${CVMDIR}/${{ matrix.os }}/fairroot/cpp20/v18.8.2_${{ matrix.fsv }}" >> $GITHUB_ENV
1515
echo "${SIMPATH}/bin" >> $GITHUB_PATH
1616
else
17-
export SIMPATH=${CVMDIR}/${{ matrix.os }}/fairsoft/${{ matrix.fsv }}
18-
echo "SIMPATH=${SIMPATH}" >> $GITHUB_ENV
19-
echo "FAIRROOTPATH=${CVMDIR}/${{ matrix.os }}/fairroot/v18.8.2_${{ matrix.fsv }}" >> $GITHUB_ENV
20-
echo "${SIMPATH}/bin" >> $GITHUB_PATH
17+
if [ "${{ matrix.os }}" == "debian13" ]; then
18+
export SIMPATH=${CVMDIR}/${{ matrix.os }}/fairsoft/cpp17/${{ matrix.fsv }}
19+
echo "SIMPATH=${SIMPATH}" >> $GITHUB_ENV
20+
echo "FAIRROOTPATH=${CVMDIR}/${{ matrix.os }}/fairroot/cpp17/v18.8.2_${{ matrix.fsv }}" >> $GITHUB_ENV
21+
echo "${SIMPATH}/bin" >> $GITHUB_PATH
22+
else
23+
export SIMPATH=${CVMDIR}/${{ matrix.os }}/fairsoft/${{ matrix.fsv }}
24+
echo "SIMPATH=${SIMPATH}" >> $GITHUB_ENV
25+
echo "FAIRROOTPATH=${CVMDIR}/${{ matrix.os }}/fairroot/v18.8.2_${{ matrix.fsv }}" >> $GITHUB_ENV
26+
echo "${SIMPATH}/bin" >> $GITHUB_PATH
27+
fi
2128
fi
2229
# variables for ccache
2330
echo "CCACHE_BASEDIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV

.github/workflows/main.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,16 @@ jobs:
9292
# Here are the groups of repositories that need to be downloaded inside
9393
# r3broot. Each group is used by only one job.
9494
repos: [ r3broot, glad-tpc, sofia-frs-asy, r3broot-conan ]
95-
os: [ debian11, debian12 ]
96-
fsv: [ jan24p1 ]
95+
os: [ debian11, debian12 , debian13]
96+
fsv: [ jan24p5 , jan24p6]
9797
cpp: [ 17 ]
98+
exclude:
99+
- os: debian11
100+
fsv: jan24p6
101+
- os: debian12
102+
fsv: jan24p6
103+
- os: debian13
104+
fsv: jan24p5
98105

99106
# The list under "include" defines some properties for each group:
100107
#
@@ -152,7 +159,7 @@ jobs:
152159
# tool-kits for the building, such as clang-tidy and cvmfs. For more
153160
# information, please visit the Docker repository at Dockerhub.
154161
container:
155-
image: yanzhaowang/cvmfs_clang:${{ matrix.os }}
162+
image: r3bdockers/${{ matrix.os }}
156163
volumes:
157164
- /tmp:/cvmfs
158165
env:

.github/workflows/static_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
matrix:
3434
preset: [ default ]
3535
os: [ debian12 ]
36-
fsv: [ jan24p1 ]
36+
fsv: [ jan24p5 ]
3737
cpp: [ 17 ]
3838
container:
3939
image: yanzhaowang/cvmfs_clang:${{ matrix.os }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ The following systems are tested regularly.
116116
| Almalinux | x86\_64 | 9.3 | GCC 11.4.1 | 3.27.9 / 4.0.3 | C++17 / C++20 / C++23 |
117117
| Almalinux | x86\_64 | 9.4 | GCC 14.2.0 | 3.30.6 | C++17 |
118118
| RHEL | x86\_64 | 9.6 | GCC 14.2.0 | 3.30.6 | C++17 |
119-
| Debian | x86\_64 | 10 | GCC 8.3.0 | 3.27.4 / 4.0.3 | C++17 |
120119
| Debian | x86\_64 | 11 | GCC 10.2.1 | 3.27.4 / 3.30.0 | C++17 |
121120
| Debian | x86\_64 | 12 | GCC 12.2.0 | 3.27.4 / 3.30.0 | C++17 / C++20 |
121+
| Debian | x86\_64 | 13 | GCC 14.2.0 | 3.31.6 / 4.0.3 | C++17 |
122122
| Ubuntu | x86\_64 | 24.04 | GCC 13.3.0 | 3.28.3 / 4.0.3 | C++17 / C++20 |
123123
| Ubuntu | x86\_64 | 25.04 | GCC 14.2.0 | 3.31.6 | C++17 |
124124
| macOS | arm64 | 15.3 | AppleClang 15 | 4.0.3 | C++17 |

0 commit comments

Comments
 (0)