diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b659d21325..e22f465793 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: jobs: test: + timeout-minutes: 25 strategy: fail-fast: false matrix: @@ -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 diff --git a/bin/run-ci.sh b/bin/run-ci.sh index 45feb20be3..0477c26ad7 100755 --- a/bin/run-ci.sh +++ b/bin/run-ci.sh @@ -11,4 +11,4 @@ sbt -Dfile.encoding=UTF-8 \ doc \ crossTestBridges \ test \ - # scripted + scripted diff --git a/build.sbt b/build.sbt index 473e372f1b..4768981137 100644 --- a/build.sbt +++ b/build.sbt @@ -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) @@ -703,4 +700,4 @@ def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask { scriptedBufferLog.value, scriptedCompileToJar.value, ) -} +}.dependsOn(publishBridges)