Skip to content

Commit

Permalink
Merge pull request #1457 from Friendseeker/enable-scripted-test
Browse files Browse the repository at this point in the history
[2.x] Enable scripted test in CI
  • Loading branch information
adpi2 authored Oct 15, 2024
2 parents 2cd1149 + 6d436ce commit fec4db9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:

jobs:
test:
timeout-minutes: 25
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -50,8 +51,7 @@ jobs:
if: ${{ matrix.jobtype == 2 }}
shell: bash
run: |
sbt -v -Dfile.encoding=UTF-8 -Dsbt.supershell=never "Test/compile" "crossTestBridges" "zincRoot/test"
# "zincScripted/Test/run"
sbt -v -Dfile.encoding=UTF-8 -Dsbt.supershell=never "Test/compile" "crossTestBridges" "zincRoot/test" "scripted"
- name: Build and test (3)
if: ${{ matrix.jobtype == 3 }}
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion bin/run-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ sbt -Dfile.encoding=UTF-8 \
doc \
crossTestBridges \
test \
# scripted
scripted
5 changes: 1 addition & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -653,9 +653,6 @@ lazy val zincScripted = (projectMatrix in internalPath / "zinc-scripted")
conflictWarning := ConflictWarning.disable,
)
.jvmPlatform(scalaVersions = scala3_only)
.configure(
_.dependsOn(compilerBridge210, compilerBridge211, compilerBridge212, compilerBridge213)
)
.configure(addSbtUtilScripted)

lazy val zincScripted3 = zincScripted.jvm(scala3)
Expand Down Expand Up @@ -703,4 +700,4 @@ def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
scriptedBufferLog.value,
scriptedCompileToJar.value,
)
}
}.dependsOn(publishBridges)

0 comments on commit fec4db9

Please sign in to comment.