Skip to content

Commit b77d37f

Browse files
authored
Merge pull request #713 from mkurz/fix_yml
Fix github actions yml
2 parents 619ba91 + 9675716 commit b77d37f

2 files changed

Lines changed: 16 additions & 24 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,28 @@ jobs:
5050
- "check-code-style"
5151
- "check-binary-compatibility"
5252
- "check-docs"
53+
strategy:
54+
matrix:
55+
java:
56+
- 21
57+
- 17
58+
plugin_scala:
59+
- 2.12.x
60+
- 3.x
61+
app_scala:
62+
- 2.13.x
63+
- 3.x
5364
uses: playframework/.github/.github/workflows/cmd.yml@v4
5465
with:
55-
matrix: |
56-
java:
57-
- '21'
58-
- '17'
59-
include:
60-
- plugin_scala: 2.12.x
61-
app_scala: 2.13.x
62-
- plugin_scala: 2.12.x
63-
app_scala: 3.x
64-
- plugin_scala: 3.x
65-
app_scala: 2.13.x
66-
- plugin_scala: 3.x
67-
app_scala: 3.x
66+
java: ${{ matrix.java }}
6867
cmd: >-
69-
sbt "
70-
++ $MATRIX_PLUGIN_SCALA;
71-
set plugin/scriptedLaunchOpts += \"-Dscripted.scala.version=$MATRIX_APP_SCALA\";
68+
sbt -Dscripted.scala.version=${{ matrix.app_scala }} "
69+
+core/publishLocal;
70+
++ ${{ matrix.plugin_scala }};
7271
show scriptedSbt;
7372
show scriptedLaunchOpts;
7473
plugin/scripted;
7574
"
76-
# Alternative:
77-
# sbt -Dscripted.scala.version=$MATRIX_APP_SCALA "++ $MATRIX_PLUGIN_SCALA" plugin/scripted
7875
7976
finish:
8077
name: Finish

build.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,7 @@ lazy val plugin = project
9999
)}",
100100
),
101101
scriptedBufferLog := false,
102-
scriptedDependencies := Def
103-
.sequential(
104-
core / publishLocal,
105-
publishLocal
106-
)
107-
.value,
102+
scriptedDependencies := publishLocal.value,
108103
)
109104
.settings(
110105
(Compile / headerSources) ++=

0 commit comments

Comments
 (0)