aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Blanvillain <olivier.blanvillain@gmail.com>2017-02-07 14:59:22 +0100
committerOlivier Blanvillain <olivier.blanvillain@gmail.com>2017-02-07 15:15:59 +0100
commitfe2e87fc7a736bb8961040c8e95cfc199513c2b4 (patch)
treea248805e387f2be3f2b4887d280b49427c85105f
parentda7d7231b7f21fe1085abc569eb783590074a359 (diff)
downloaddotty-fe2e87fc7a736bb8961040c8e95cfc199513c2b4.tar.gz
dotty-fe2e87fc7a736bb8961040c8e95cfc199513c2b4.tar.bz2
dotty-fe2e87fc7a736bb8961040c8e95cfc199513c2b4.zip
Fix dotr/dotc scripts
-rw-r--r--.drone.yml2
-rwxr-xr-xbin/common2
-rw-r--r--project/Build.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/.drone.yml b/.drone.yml
index 544eae07b..dd2729a6f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,7 +33,7 @@ pipeline:
matrix:
TEST:
- - test
+ - ;test;dotty-bin-tests/test
- ;publishLocal;dotty-bootstrapped/test
- partest-only-no-bootstrap --show-diff --verbose
- partest-only --show-diff --verbose
diff --git a/bin/common b/bin/common
index 1cb79fc14..b5fd27232 100755
--- a/bin/common
+++ b/bin/common
@@ -8,7 +8,7 @@ function getLastStringOnLineWith {
}
# Configuration
-SCALA_VERSION=$(getLastStringOnLineWith "scalaVersion in")
+SCALA_VERSION=$(getLastStringOnLineWith "val scalacVersion")
SCALA_BINARY_VERSION=2.11
SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scala-compiler")
SBT_VERSION=$(grep "sbt.version=" "$DOTTY_ROOT/project/build.properties" | sed 's/sbt.version=//')
diff --git a/project/Build.scala b/project/Build.scala
index a6505a12c..96ee7cdf7 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -11,7 +11,7 @@ import sbt.Package.ManifestAttributes
object DottyBuild extends Build {
- val scalacVersion = "2.11.5"
+ val scalacVersion = "2.11.5" // Do not rename, this is grepped in bin/common.
val dottyOrganization = "ch.epfl.lamp"
val dottyVersion = {