Skip to content

Commit 56b5ca3

Browse files
committed
Compiler root in CI
1 parent 3a72da6 commit 56b5ca3

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.drone.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ pipeline:
1313
image: lampepfl/dotty:2017-10-20
1414
commands:
1515
- cp -R . /tmp/1/ && cd /tmp/1/
16+
- ./project/scripts/sbt compile
1617
- ./project/scripts/sbt testAll
17-
- ./project/scripts/sbt ";dotty-bench/jmh:run 1 1 tests/run/arrays.scala"
1818

1919
test_bootstrapped:
2020
group: test
2121
image: lampepfl/dotty:2017-10-20
2222
commands:
2323
- cp -R . /tmp/2/ && cd /tmp/2/
2424
- ./project/scripts/sbt dotty-bootstrapped/testAll
25-
- ./project/scripts/sbt ";dotty-bench-bootstrapped/jmh:run 1 1 tests/run/arrays.scala"
2625

2726
test_optimised:
2827
group: test

project/Build.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,12 @@ object Build {
821821
lazy val `dotty-bench-bootstrapped` = project.in(file("bench")).asDottyBench(Bootstrapped)
822822
lazy val `dotty-bench-optimised` = project.in(file("bench")).asDottyBench(BootstrappedOptimised)
823823

824+
def dottyBench(implicit mode: Mode): Project = mode match {
825+
case NonBootstrapped => `dotty-bench`
826+
case Bootstrapped => `dotty-bench-bootstrapped`
827+
case BootstrappedOptimised => `dotty-bench-optimised`
828+
}
829+
824830
// Depend on dotty-library so that sbt projects using dotty automatically
825831
// depend on the dotty-library
826832
lazy val `scala-library` = project.
@@ -1134,6 +1140,7 @@ object Build {
11341140
bootstrappedAggregate(`scala-library`, `scala-compiler`, `scala-reflect`, scalap, `dotty-language-server`).
11351141
dependsOn(dottyCompiler).
11361142
dependsOn(dottyLibrary).
1143+
dependsOn(dottyBench). // just to make sure it compiles
11371144
nonBootstrappedSettings(
11381145
triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
11391146
dottyProjectFolderChecks,

0 commit comments

Comments
 (0)