diff options
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | integration/test/resources/play-json/build.sc | 8 | ||||
| -rw-r--r-- | integration/test/resources/play-json/mima.sc | 7 | ||||
| -rw-r--r-- | integration/test/resources/play-json/playJsonVersion.sc (renamed from integration/test/resources/play-json/version.sc) | 0 | ||||
| -rw-r--r-- | main/test/src/mill/util/ScriptTestSuite.scala | 6 |
5 files changed, 17 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index b63d7028..e0e20fc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,6 @@ matrix: include: - stage: build env: CI_SCRIPT=ci/test-mill-0.sh - jdk: oraclejdk9 - - stage: build - env: CI_SCRIPT=ci/test-mill-0.sh jdk: oraclejdk8 - stage: build env: CI_SCRIPT=ci/test-mill-1.sh @@ -18,16 +15,21 @@ matrix: jdk: oraclejdk8 - stage: build env: CI_SCRIPT=ci/test-mill-dev.sh - jdk: oraclejdk9 + jdk: oraclejdk8 - stage: build - env: CI_SCRIPT=ci/test-mill-dev.sh + env: CI_SCRIPT=ci/test-mill-release.sh jdk: oraclejdk8 + - stage: build env: CI_SCRIPT=ci/test-mill-release.sh jdk: oraclejdk9 - stage: build - env: CI_SCRIPT=ci/test-mill-release.sh - jdk: oraclejdk8 + env: CI_SCRIPT=ci/test-mill-dev.sh + jdk: oraclejdk9 + - stage: build + env: CI_SCRIPT=ci/test-mill-0.sh + jdk: oraclejdk9 + - stage: release env: CI_SCRIPT="ci/on-master.py ci/release.sh" jdk: oraclejdk8 diff --git a/integration/test/resources/play-json/build.sc b/integration/test/resources/play-json/build.sc index e5222ae1..c60eefba 100644 --- a/integration/test/resources/play-json/build.sc +++ b/integration/test/resources/play-json/build.sc @@ -1,5 +1,5 @@ import mill._, mill.scalalib._, mill.scalalib.publish._, mill.scalajslib._ -import $file.version +import $file.playJsonVersion import $file.reformat import reformat.Scalariform import $file.mima @@ -47,7 +47,7 @@ trait PlayJsonModule extends BaseModule with PublishModule with MiMa { def scalacOptions = Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") def javacOptions = Seq("-encoding", "UTF-8", "-Xlint:-options") - def publishVersion = version.current + def publishVersion = playJsonVersion.current } abstract class PlayJson(val platformSegment: String) extends PlayJsonModule { @@ -329,14 +329,14 @@ object release extends Module { private val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r private val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.(\d+)-SNAPSHOT""".r - private val releaseVersion = version.current match { + private val releaseVersion = playJsonVersion.current match { case MinorSnapshotVersion(major, minor, patch) => s"${major}.${minor}.${patch.toInt}" case ReleaseVersion(major, minor, patch) => s"${major}.${minor}.${patch.toInt}" } - private val nextVersion = version.current match { + private val nextVersion = playJsonVersion.current match { case v@MinorSnapshotVersion(major, minor, patch) => v case ReleaseVersion(major, minor, patch) => s"${major}.${minor}.${patch.toInt + 1}-SNAPSHOT" diff --git a/integration/test/resources/play-json/mima.sc b/integration/test/resources/play-json/mima.sc index ebab2c72..3902f2c7 100644 --- a/integration/test/resources/play-json/mima.sc +++ b/integration/test/resources/play-json/mima.sc @@ -18,12 +18,7 @@ trait MiMa extends ScalaModule with PublishModule { def previousDeps = T { Agg.from(previousVersions().map { version => - Dep.Java( - pomSettings().organization, - artifactId(), - version, - cross = false - ) + ivy"${pomSettings().organization}:${artifactId()}:${version}" }) } diff --git a/integration/test/resources/play-json/version.sc b/integration/test/resources/play-json/playJsonVersion.sc index e9dbb12f..e9dbb12f 100644 --- a/integration/test/resources/play-json/version.sc +++ b/integration/test/resources/play-json/playJsonVersion.sc diff --git a/main/test/src/mill/util/ScriptTestSuite.scala b/main/test/src/mill/util/ScriptTestSuite.scala index a2f2676a..2df1c0c0 100644 --- a/main/test/src/mill/util/ScriptTestSuite.scala +++ b/main/test/src/mill/util/ScriptTestSuite.scala @@ -10,8 +10,8 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{ def scriptSourcePath: Path val workspacePath = pwd / 'target / 'workspace / workspaceSlug - val stdOutErr = new PrintStream(new ByteArrayOutputStream()) -// val stdOutErr = new PrintStream(System.out) +// val stdOutErr = new PrintStream(new ByteArrayOutputStream()) + val stdOutErr = new PrintStream(System.out) val stdIn = new ByteArrayInputStream(Array()) lazy val runner = new mill.main.MainRunner( ammonite.main.Cli.Config(wd = workspacePath), @@ -21,7 +21,7 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{ if (!fork) runner.runScript(workspacePath / "build.sc", s.toList) else{ try { - %%(home / "mill-release", "-i", s)(workspacePath) + %(home / "mill-release", "-i", s)(workspacePath) true }catch{case e: Throwable => false} } |