Skip to content

Commit 2cec1bb

Browse files
trwsgrondo
authored andcommitted
matrix: remove redundant fedora40 builder
problem: the no-args fedora40 and version with just prefix arguments are identical for all intents and purposes solution: remove the no-args version in favor of the one that generates a docker tag
1 parent 34d9c4f commit 2cec1bb

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

src/test/generate-matrix.py

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@ def __str__(self):
146146

147147
matrix = BuildMatrix()
148148

149-
# Fedora40: no args
150-
matrix.add_build(name="fedora40")
151-
152149
# Debian: 32b
153150
matrix.add_build(
154151
name="bookworm - 32 bit",
@@ -211,6 +208,31 @@ def __str__(self):
211208
env=dict(
212209
TEST_INSTALL="t",
213210
),
211+
platform="linux/amd64",
212+
args="--with-flux-security --enable-caliper",
213+
docker_tag=True,
214+
)
215+
216+
# Ubuntu: TEST_INSTALL
217+
matrix.add_build(
218+
name="jammy - test-install",
219+
image="jammy",
220+
env=dict(
221+
TEST_INSTALL="t",
222+
),
223+
args="--with-flux-security --enable-caliper",
224+
docker_tag=True,
225+
)
226+
227+
# Debian: TEST_INSTALL
228+
matrix.add_build(
229+
name="bookworm - test-install",
230+
image="bookworm",
231+
env=dict(
232+
TEST_INSTALL="t",
233+
),
234+
platform="linux/amd64",
235+
args="--with-flux-security --enable-caliper",
214236
docker_tag=True,
215237
)
216238

@@ -261,7 +283,7 @@ def __str__(self):
261283

262284
# Fedora 40
263285
matrix.add_build(
264-
name="fedora40 - gcc-14.1,py3.12",
286+
name="fedora40 - gcc-14",
265287
image="fedora40",
266288
args=(
267289
"--prefix=/usr"

0 commit comments

Comments
 (0)