Skip to content

Commit d29d157

Browse files
committed
Make test_distribution_specific_wsl_bash_scripts names unique
1 parent a2f462b commit d29d157

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/test.main.kts

+6-2
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ workflowWithCopyright(
808808

809809
testJob(
810810
id = "test_distribution_specific_wsl_bash_scripts",
811-
name = "Test distribution specific wsl-bash scripts on ${expr("matrix.environment")}",
811+
name = "Test distribution specific wsl-bash scripts on ${expr("matrix.environment")} (without ${expr("matrix.distributions.incompatibleUbuntu")})",
812812
_customArguments = mapOf(
813813
"strategy" to mapOf(
814814
"fail-fast" to false,
@@ -821,9 +821,13 @@ workflowWithCopyright(
821821
.map { incompatibleUbuntu ->
822822
distributions
823823
.filter { it != incompatibleUbuntu }
824-
.mapIndexed { i, distribution ->
824+
.mapIndexed<Map<String, String>, Pair<String, Any>> { i, distribution ->
825825
"distribution${i + 1}" to distribution
826826
}
827+
.toMutableList()
828+
.apply {
829+
add(0, "incompatibleUbuntu" to incompatibleUbuntu["user-id"]!!)
830+
}
827831
.toMap()
828832
}
829833
)

.github/workflows/test.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ jobs:
15011501
always()
15021502
&& (steps.step-9.outcome == 'success')
15031503
test_distribution_specific_wsl_bash_scripts:
1504-
name: 'Test distribution specific wsl-bash scripts on ${{ matrix.environment }}'
1504+
name: 'Test distribution specific wsl-bash scripts on ${{ matrix.environment }} (without ${{ matrix.distributions.incompatibleUbuntu }})'
15051505
runs-on: '${{ matrix.environment }}'
15061506
needs:
15071507
- 'build'
@@ -1514,7 +1514,8 @@ jobs:
15141514
- 'windows-2022'
15151515
- 'windows-latest'
15161516
distributions:
1517-
- distribution1:
1517+
- incompatibleUbuntu: 'Ubuntu-22.04'
1518+
distribution1:
15181519
wsl-id: 'Debian'
15191520
user-id: 'Debian'
15201521
match-pattern: '*Debian*'
@@ -1554,7 +1555,8 @@ jobs:
15541555
user-id: 'Ubuntu-16.04'
15551556
match-pattern: '*Ubuntu*16.04*'
15561557
default-absent-tool: 'dos2unix'
1557-
- distribution1:
1558+
- incompatibleUbuntu: 'Ubuntu-20.04'
1559+
distribution1:
15581560
wsl-id: 'Debian'
15591561
user-id: 'Debian'
15601562
match-pattern: '*Debian*'

0 commit comments

Comments
 (0)