Fix rendering

(cherry picked from commit 94e06227498a7f95d1d938bde5ef980d5fe7fd14)
sbt · Sep 18, 2023 · 4adaa36 · 4adaa36
1 parent bbb956b
commit 4adaa36
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -129,7 +129,7 @@ jobs:
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
 
-      - name: Inflate target directories (List(2.12.18))
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/src/main/scala/sbtghactions/GenerativePlugin.scala b/src/main/scala/sbtghactions/GenerativePlugin.scala
@@ -698,20 +698,22 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
 
       if (githubWorkflowArtifactUpload.value) {
         artifacts flatMap { v =>
+          val pretty = v.mkString(", ")
+
           val download = WorkflowStep.Use(
             UseRef.Public(
               "actions",
               "download-artifact",
               "v3"),
-            name = Some(s"Download target directories (${v.mkString(", ")})"),
+            name = Some(s"Download target directories ($pretty)"),
             params = Map(
               "name" -> s"target-$${{ matrix.os }}-$${{ matrix.java }}${v.mkString("-", "-", "")}"))
 
           val untar = WorkflowStep.Run(
             List(
               "tar xf targets.tar",
               "rm targets.tar"),
-            name = Some(s"Inflate target directories ($v)"))
+            name = Some(s"Inflate target directories ($pretty)"))
 
           Seq(download, untar)
         }

diff --git a/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml b/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml
@@ -117,7 +117,7 @@ jobs:
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-2.12.17-this
 
-      - name: Inflate target directories (List(2.13.10, 2.12.17, this))
+      - name: Inflate target directories (2.13.10, 2.12.17, this)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml
@@ -83,7 +83,7 @@ jobs:
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-2.12.17
 
-      - name: Inflate target directories (List(2.13.10, 2.12.17))
+      - name: Inflate target directories (2.13.10, 2.12.17)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10
 
-      - name: Inflate target directories (List(2.13.10))
+      - name: Inflate target directories (2.13.10)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
 
-      - name: Inflate target directories (List(2.12.18))
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml b/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml
@@ -84,7 +84,7 @@ jobs:
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10
 
-      - name: Inflate target directories (List(2.13.10))
+      - name: Inflate target directories (2.13.10)
         run: |
           tar xf targets.tar
           rm targets.tar