diff options
-rw-r--r-- | integration/test/resources/ammonite/build.sc | 18 | ||||
-rw-r--r-- | main/test/src/mill/util/ScriptTestSuite.scala | 2 |
2 files changed, 2 insertions, 18 deletions
diff --git a/integration/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc index 8dff405a..018bf2b0 100644 --- a/integration/test/resources/ammonite/build.sc +++ b/integration/test/resources/ammonite/build.sc @@ -1,17 +1,6 @@ import mill._, scalalib._, publish._ import ammonite.ops._, ImplicitWd._ -val isMasterCommit = - sys.env.get("TRAVIS_PULL_REQUEST") == Some("false") && - (sys.env.get("TRAVIS_BRANCH") == Some("master") || sys.env("TRAVIS_TAG") != "") - -val latestTaggedVersion = %%('git, 'describe, "--abbrev=0", "--tags").out.trim - -val commitsSinceTaggedVersion = { - %%('git, "rev-list", 'master, "--not", latestTaggedVersion, "--count").out.trim.toInt -} - - val binCrossScalaVersions = Seq("2.11.12", "2.12.7") val fullCrossScalaVersions = Seq( "2.11.3", "2.11.4", "2.11.5", "2.11.6", "2.11.7", "2.11.8", "2.11.9", "2.11.11", "2.11.12", @@ -20,12 +9,7 @@ val fullCrossScalaVersions = Seq( val latestAssemblies = binCrossScalaVersions.map(amm(_).assembly) -val (buildVersion, unstable) = sys.env.get("TRAVIS_TAG") match{ - case Some(v) if v != "" => (v, false) - case _ => - val gitHash = %%("git", "rev-parse", "--short", "HEAD").out.trim - (s"$latestTaggedVersion-$commitsSinceTaggedVersion-${gitHash}", true) -} +val buildVersion = "dev" trait AmmInternalModule extends mill.scalalib.CrossSbtModule{ def artifactName = "ammonite-" + millOuterCtx.segments.parts.last diff --git a/main/test/src/mill/util/ScriptTestSuite.scala b/main/test/src/mill/util/ScriptTestSuite.scala index 8a639f92..f448aaaf 100644 --- a/main/test/src/mill/util/ScriptTestSuite.scala +++ b/main/test/src/mill/util/ScriptTestSuite.scala @@ -11,7 +11,7 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{ val workspacePath = os.pwd / 'target / 'workspace / workspaceSlug val wd = workspacePath / buildPath / os.up - val stdOutErr = new PrintStream(new ByteArrayOutputStream()) + val stdOutErr = System.out // new PrintStream(new ByteArrayOutputStream()) val stdIn = new ByteArrayInputStream(Array()) val disableTicker = false val debugLog = false |