Skip to content

Commit a0dc2fe

Browse files
committed
Fix assembling and serial (non-parallel) testing
1 parent 4bbd26b commit a0dc2fe

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/scala.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Build and test
4444
shell: bash
45-
run: sbt -v +test test-serial:test
45+
run: sbt -v +test testSerial
4646

4747
test-assembly:
4848
runs-on: ubuntu-latest
@@ -63,7 +63,7 @@ jobs:
6363
shell: bash
6464
run: |
6565
sbt -v assembly
66-
mv target/scala-*/jelly-cli-assembly*.jar jelly-cli.jar
66+
mv target/out/jvm/scala-*/jelly-cli/jelly-cli-assembly*.jar jelly-cli.jar
6767
6868
- name: Test the assembly
6969
run: |

build.sbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ lazy val jellyV = "3.7.3"
1010
lazy val graalvmV = "25.0.3"
1111

1212
addCommandAlias("fixAll", "scalafixAll; scalafmtAll")
13+
addCommandAlias(
14+
"testSerial",
15+
";set Test / parallelExecution := false ;Test / test ;set Test / parallelExecution := true"
16+
)
1317

1418
lazy val wErrorIfCI = if (sys.env.contains("CI")) Seq("-Werror") else Seq()
1519

0 commit comments

Comments
 (0)