Skip to content

Commit 7a55ebc

Browse files
committed
ci: Build always full matrix
1 parent 95c4d41 commit 7a55ebc

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

Jenkinsfile

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -116,23 +116,16 @@ pipeline {
116116
script {
117117
def ctestcmd = "ctest -VV -S FairSoft_test.cmake"
118118
def specs_list = [
119-
[os: 'CentOS-7', container: 'centos.7.sif'],
120119
[os: 'Debian-10', container: 'debian.10.sif'],
121120
[os: 'Debian-11', container: 'debian.11.sif'],
122-
[os: 'Debian-12', container: 'debian.12.sif', for_pr: true],
123-
[os: 'Fedora-37', container: 'fedora.37.sif', for_pr: true],
121+
[os: 'Debian-12', container: 'debian.12.sif'],
122+
[os: 'Fedora-37', container: 'fedora.37.sif'],
124123
[os: 'Fedora-38', container: 'fedora.38.sif'],
125-
[os: 'Fedora-39', container: 'fedora.39.sif', for_pr: true,
124+
[os: 'Fedora-39', container: 'fedora.39.sif',
126125
extra: '-DCMAKE_CXX_STANDARD=20'],
127126
[os: 'Ubuntu-22.04-LTS', container: 'ubuntu.22.04.sif'],
128127
]
129128

130-
if (env.CHANGE_ID != null) {
131-
specs_list = specs_list.findAll {
132-
elmt -> elmt.getOrDefault("for_pr", false)
133-
}
134-
}
135-
136129
def linux_jobs = jobMatrix('slurm',
137130
ctestcmd + " -DUSE_TEMPDIR:BOOL=ON", specs_list
138131
) { spec, label, jobsh, ctest ->
@@ -141,17 +134,11 @@ pipeline {
141134
""")
142135
}
143136

144-
if (env.CHANGE_ID != null) {
145-
specs_list = [
146-
[os: 'macOS'],
147-
];
148-
} else {
149-
specs_list = [
150-
[os: 'macos-13-x86_64'],
151-
[os: 'macos-14-x86_64'],
152-
[os: 'macos-14-arm64']
153-
];
154-
}
137+
specs_list = [
138+
[os: 'macos-13-x86_64'],
139+
[os: 'macos-14-x86_64'],
140+
[os: 'macos-14-arm64']
141+
];
155142

156143
def macos_jobs = jobMatrix('macos', ctestcmd, specs_list)
157144
{ spec, label, jobsh, ctest ->

0 commit comments

Comments
 (0)