Skip to content

Commit a70a402

Browse files
committed
Handle case where githubWorkflowBuildMatrixAdditions is empty
1 parent a6b9be1 commit a70a402

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: Upload target directories
7777
uses: actions/upload-artifact@v3
7878
with:
79-
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
79+
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
8080
path: targets.tar
8181

8282
publish:
@@ -124,12 +124,12 @@ jobs:
124124
github-token: ${{ secrets.GITHUB_TOKEN }}
125125
cache: sbt
126126

127-
- name: Download target directories (2.12.18,rootJVM)
127+
- name: Download target directories (2.12.18)
128128
uses: actions/download-artifact@v3
129129
with:
130-
name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}-2.12.18-rootJVM
130+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
131131

132-
- name: Inflate target directories (List(2.12.18, rootJVM))
132+
- name: Inflate target directories (List(2.12.18))
133133
run: |
134134
tar xf targets.tar
135135
rm targets.tar

src/main/scala/sbtghactions/GenerativePlugin.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,11 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
636636
List(s"tar cf targets.tar ${sanitized.mkString(" ")} project/target"),
637637
name = Some("Compress target directories"))
638638

639-
val keys = githubWorkflowBuildMatrixAdditions
640-
.value
639+
val matrixAdditions = githubWorkflowBuildMatrixAdditions.value
640+
val keys = if (matrixAdditions.isEmpty)
641+
""
642+
else
643+
matrixAdditions
641644
.keys
642645
.toList
643646
.sorted

src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Upload target directories
5252
uses: actions/upload-artifact@v3
5353
with:
54-
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-
54+
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
5555
path: targets.tar
5656

5757
publish:

src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Upload target directories
5151
uses: actions/upload-artifact@v3
5252
with:
53-
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-
53+
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
5454
path: targets.tar
5555

5656
publish:

src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Upload target directories
6868
uses: actions/upload-artifact@v3
6969
with:
70-
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-
70+
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
7171
path: targets.tar
7272

7373
publish:

src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Upload target directories
5353
uses: actions/upload-artifact@v3
5454
with:
55-
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-
55+
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
5656
path: targets.tar
5757

5858
publish:

0 commit comments

Comments
 (0)