Skip to content

Commit 10c6437

Browse files
committed
chore: add support for sbt-test in the new build
1 parent 746ebc8 commit 10c6437

File tree

3 files changed

+45
-0
lines changed

3 files changed

+45
-0
lines changed

.github/workflows/stdlib.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,26 @@ jobs:
333333
- uses: sbt/setup-sbt@v1
334334
- name: Test `tasty-core-bootstrapped`
335335
run: ./project/scripts/sbt tasty-core-bootstrapped-new/test
336+
337+
sbt-test:
338+
runs-on: ubuntu-latest
339+
##needs: [scala3-sbt-bridge-bootstrapped,
340+
## scala3-library-bootstrapped,
341+
## scala3-compiler-bootstrapped,
342+
## tasty-core-bootstrapped,
343+
## scala3-library-sjs,
344+
## scala3-tasty-inspector,
345+
## scala3-staging] Add when we add support for caching here
346+
steps:
347+
- name: Git Checkout
348+
uses: actions/checkout@v5
349+
350+
- name: Set up JDK 17
351+
uses: actions/setup-java@v4
352+
with:
353+
distribution: 'temurin'
354+
java-version: 17
355+
cache: 'sbt'
356+
- uses: sbt/setup-sbt@v1
357+
- name: Run `sbt-test`
358+
run: ./project/scripts/sbt sbt-test-new/scripted

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ val sjsJUnitTests = Build.sjsJUnitTests
5959
val sjsCompilerTests = Build.sjsCompilerTests
6060

6161
val `sbt-test` = Build.`sbt-test`
62+
val `sbt-test-new` = Build.`sbt-test-new`
6263

6364
inThisBuild(Build.thisBuildSettings)
6465
inScope(Global)(Build.globalSettings)

project/Build.scala

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,6 +2368,27 @@ object Build {
23682368
}.taskValue,
23692369
)
23702370

2371+
// ==============================================================================================
2372+
// ========================================= TEST SUITE =========================================
2373+
// ==============================================================================================
2374+
2375+
lazy val `sbt-test-new` = project.in(file("sbt-test"))
2376+
.enablePlugins(ScriptedPlugin)
2377+
.settings(
2378+
sbtTestDirectory := baseDirectory.value,
2379+
// The batch mode accidentally became the default with no way to disable
2380+
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
2381+
// We enable it explicitly here to make it clear that we're using it.
2382+
scriptedBatchExecution := true,
2383+
scriptedLaunchOpts ++= Seq(
2384+
s"-Dplugin.scalaVersion=${dottyVersion}",
2385+
s"-Dplugin.scala2Version=${stdlibVersion(Bootstrapped)}",
2386+
s"-Dplugin.scalaJSVersion=${scalaJSVersion}",
2387+
),
2388+
scriptedBufferLog := true,
2389+
scripted := scripted.dependsOn(`scala3-bootstrapped-new` / publishLocalBin).evaluated
2390+
)
2391+
23712392
def dottyLibrary(implicit mode: Mode): Project = mode match {
23722393
case NonBootstrapped => `scala3-library`
23732394
case Bootstrapped => `scala3-library-bootstrapped`

0 commit comments

Comments
 (0)