Skip to content

Update sbt and Drone image #4740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@ 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"
- ./project/scripts/cmdTests

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
Expand All @@ -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 ]
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
1 change: 0 additions & 1 deletion dist-bootstrapped/bin

This file was deleted.

1 change: 0 additions & 1 deletion dist-optimised/bin

This file was deleted.

14 changes: 12 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.
// *
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.5
sbt.version=1.1.6