diff --git a/.drone.yml b/.drone.yml index abb588fdce65..a31c04c43d52 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ pipeline: # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict test: group: test - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 commands: - cp -R . /tmp/1/ && cd /tmp/1/ - ./project/scripts/sbt ";compile ;test" @@ -31,21 +31,21 @@ pipeline: test_bootstrapped: group: test - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 commands: - cp -R . /tmp/2/ && cd /tmp/2/ - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test" test_optimised: group: test - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 commands: - cp -R . /tmp/3/ && cd /tmp/3/ - ./project/scripts/sbt dotty-optimised/test test_sbt: group: test - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 commands: - cp -R . /tmp/4/ && cd /tmp/4/ - ./project/scripts/sbt sbt-dotty/scripted @@ -55,7 +55,7 @@ pipeline: # DOCUMENTATION: documentation: - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 commands: - ./project/scripts/genDocs secrets: [ bot_pass ] @@ -67,7 +67,7 @@ pipeline: # PUBLISHING: # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala publish_nightly: - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 environment: - NIGHTLYBUILD=yes commands: @@ -78,7 +78,7 @@ pipeline: environment: nightly publish_release: - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 environment: - RELEASEBUILD=yes commands: @@ -102,7 +102,7 @@ pipeline: event: tag publish_sbt_release: - image: lampepfl/dotty:2018-05-23 + image: lampepfl/dotty:2018-06-29 environment: - RELEASEBUILD=yes commands: diff --git a/dist-bootstrapped/bin b/dist-bootstrapped/bin deleted file mode 120000 index 2970afbb0422..000000000000 --- a/dist-bootstrapped/bin +++ /dev/null @@ -1 +0,0 @@ -../dist/bin \ No newline at end of file diff --git a/dist-optimised/bin b/dist-optimised/bin deleted file mode 120000 index 2970afbb0422..000000000000 --- a/dist-optimised/bin +++ /dev/null @@ -1 +0,0 @@ -../dist/bin \ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index 3c1041defda5..62fdb17e3f34 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1138,13 +1138,21 @@ object Build { publishArtifact := false, packGenerateMakefile := false, packExpandedClasspath := true, - packResourceDir += (baseDirectory.value / "bin" -> "bin"), packArchiveName := "dotty-" + dottyVersion ) lazy val dist = project.asDist(NonBootstrapped) + .settings( + packResourceDir += (baseDirectory.value / "bin" -> "bin"), + ) lazy val `dist-bootstrapped` = project.asDist(Bootstrapped) + .settings( + packResourceDir += ((baseDirectory in dist).value / "bin" -> "bin"), + ) lazy val `dist-optimised` = project.asDist(BootstrappedOptimised) + .settings( + packResourceDir += ((baseDirectory in dist).value / "bin" -> "bin"), + ) // /** A sandbox to play with the Scala.js back-end of dotty. // * @@ -1237,7 +1245,9 @@ object Build { withCommonSettings. dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc). settings(commonDistSettings). - bootstrappedSettings(target := baseDirectory.value / "target") // override setting in commonBootstrappedSettings + bootstrappedSettings( + target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings + ) def withCommonSettings(implicit mode: Mode): Project = project.settings(mode match { case NonBootstrapped => commonNonBootstrappedSettings diff --git a/project/build.properties b/project/build.properties index 7c817378178a..d6e35076cc16 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.5 +sbt.version=1.1.6