Make test_distribution_specific_wsl_bash_scripts names unique

Vampire · May 27, 2024 · d29d157 · d29d157
1 parent a2f462b
commit d29d157
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/test.main.kts b/.github/workflows/test.main.kts
@@ -808,7 +808,7 @@ workflowWithCopyright(
 
     testJob(
         id = "test_distribution_specific_wsl_bash_scripts",
-        name = "Test distribution specific wsl-bash scripts on ${expr("matrix.environment")}",
+        name = "Test distribution specific wsl-bash scripts on ${expr("matrix.environment")} (without ${expr("matrix.distributions.incompatibleUbuntu")})",
         _customArguments = mapOf(
             "strategy" to mapOf(
                 "fail-fast" to false,
@@ -821,9 +821,13 @@ workflowWithCopyright(
                         .map { incompatibleUbuntu ->
                             distributions
                                 .filter { it != incompatibleUbuntu }
-                                .mapIndexed { i, distribution ->
+                                .mapIndexed<Map<String, String>, Pair<String, Any>> { i, distribution ->
                                     "distribution${i + 1}" to distribution
                                 }
+                                .toMutableList()
+                                .apply {
+                                    add(0, "incompatibleUbuntu" to incompatibleUbuntu["user-id"]!!)
+                                }
                                 .toMap()
                         }
                 )

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1501,7 +1501,7 @@ jobs:
         always()
         && (steps.step-9.outcome == 'success')
   test_distribution_specific_wsl_bash_scripts:
-    name: 'Test distribution specific wsl-bash scripts on ${{ matrix.environment }}'
+    name: 'Test distribution specific wsl-bash scripts on ${{ matrix.environment }} (without ${{ matrix.distributions.incompatibleUbuntu }})'
     runs-on: '${{ matrix.environment }}'
     needs:
     - 'build'
@@ -1514,7 +1514,8 @@ jobs:
         - 'windows-2022'
         - 'windows-latest'
         distributions:
-        - distribution1:
+        - incompatibleUbuntu: 'Ubuntu-22.04'
+          distribution1:
             wsl-id: 'Debian'
             user-id: 'Debian'
             match-pattern: '*Debian*'
@@ -1554,7 +1555,8 @@ jobs:
             user-id: 'Ubuntu-16.04'
             match-pattern: '*Ubuntu*16.04*'
             default-absent-tool: 'dos2unix'
-        - distribution1:
+        - incompatibleUbuntu: 'Ubuntu-20.04'
+          distribution1:
             wsl-id: 'Debian'
             user-id: 'Debian'
             match-pattern: '*Debian*'