Skip to content

Commit 5a3fc30

Browse files
ChristianTackeGSIdennisklein
authored andcommitted
ci: Do not check Geant3 on macos
It looks like Geant3 fails always on macos. So disable it even in branch builds on macos. Co-authored-by: @dennisklein
1 parent 927b1f2 commit 5a3fc30

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

FairRoot_build_test.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ endif()
4646
if (USE_CLANG_TIDY)
4747
list(APPEND options "-DCMAKE_CXX_CLANG_TIDY=clang-tidy")
4848
endif()
49-
if ("$ENV{CHANGE_ID}" STREQUAL "")
50-
# Branch build
51-
list(APPEND options "-DENABLE_GEANT3_TESTING:BOOL=ON")
49+
if (ENABLE_GEANT3_TESTING)
50+
list(APPEND options "-DENABLE_GEANT3_TESTING=ON")
5251
endif()
5352
ctest_configure(OPTIONS "${options}")
5453

Jenkinsfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ def linux_checks = [
3636
[os: 'ubuntu', ver: 'rolling', compiler: 'current', fairsoft: 'dev', check: 'doxygen'],
3737
]
3838

39-
if (env.CHANGE_ID != null) { // only run checks for PRs
39+
def isBranchBuild() {
40+
return !env.CHANGE_ID
41+
}
42+
43+
if (!isBranchBuild()) { // PRs only
4044
linux_checks += [
4145
[os: "ubuntu", ver: "rolling", compiler: "current", fairsoft: "dev", check: "format"]
4246
]
@@ -95,6 +99,9 @@ def jobMatrix(String type, String src, List specs) {
9599
ctestcmd = "ctest -S ${sourcedir}/FairRoot_${check}_test.cmake -VV"
96100
sh "echo \"export FAIRROOT_FORMAT_BASE=origin/\${CHANGE_TARGET}\" >> ${jobscript}"
97101
}
102+
if (isBranchBuild() && !(os =~ /^macos/)) {
103+
ctestcmd += " -DENABLE_GEANT3_TESTING=ON"
104+
}
98105
if (extra) {
99106
ctestcmd = ctestcmd + " " + extra
100107
}

0 commit comments

Comments
 (0)