Skip to content

Commit 88c5b99

Browse files
Vampireleonard84
authored andcommitted
Fix Groovy 5 publishing workflow
1 parent 1c0a951 commit 88c5b99

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

.github/workflows/release.main.kts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,21 @@ workflow(
113113
name = "Release Spock",
114114
runsOn = RunnerType.Custom(expr(Matrix.operatingSystem)),
115115
needs = listOf(buildAndVerify),
116-
strategyMatrix = mapOf(
117-
// publish needs to be done for all versions
118-
"variant" to Matrix.axes.variants,
119-
// publish needs the min supported java version
120-
"java" to Matrix.axes.javaVersions.take(1),
121-
"os" to listOf("ubuntu-latest")
116+
_customArguments = mapOf(
117+
"strategy" to Strategy(
118+
matrix = Matrix(
119+
operatingSystems = listOf("ubuntu-latest"),
120+
variants = Matrix.axes.variants.filter { it != "5.0" },
121+
javaVersions = Matrix.axes.javaVersions.take(1),
122+
includes = listOf(
123+
Matrix.Element(
124+
variant = "5.0",
125+
javaVersion = "11",
126+
operatingSystem = "ubuntu-latest"
127+
)
128+
)
129+
)
130+
).toCustomArguments()
122131
)
123132
) {
124133
uses(

.github/workflows/release.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,20 @@ jobs:
114114
- 'build-and-verify'
115115
- 'check_yaml_consistency'
116116
strategy:
117+
fail-fast: false
117118
matrix:
118119
variant:
119120
- '2.5'
120121
- '3.0'
121122
- '4.0'
122-
- '5.0'
123123
java:
124124
- '8'
125125
os:
126126
- 'ubuntu-latest'
127+
include:
128+
- variant: '5.0'
129+
java: '11'
130+
os: 'ubuntu-latest'
127131
steps:
128132
- id: 'step-0'
129133
name: 'Checkout Repository'

0 commit comments

Comments
 (0)