summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRobby <robby@santoslab.org>2018-04-07 08:23:42 -0500
committerGitHub <noreply@github.com>2018-04-07 08:23:42 -0500
commitccb67db3759a16e95a75920d87281185310ccd81 (patch)
treeb901d0173eaf48489583c9a905914baaaf3486ab /.travis.yml
parente628c84be7cf0b7bb00ba2141635d29503203fc4 (diff)
downloadmill-ccb67db3759a16e95a75920d87281185310ccd81.tar.gz
mill-ccb67db3759a16e95a75920d87281185310ccd81.tar.bz2
mill-ccb67db3759a16e95a75920d87281185310ccd81.zip
Merge April 1 - 4, 2018 changes on master (#283)
* fix build * Detect sh/batch launcher, dev.assembly, and release filename. * Updated appveyor cache. * Added some entries for master in readme.md changelog. * Updated readme.md changelog. * fixes #173; use default(compile) configuration for deps as default (#270) * revert #254 to fix bootstrapping https://github.com/lihaoyi/mill/issues/268 * Updated ci tests. * Reverted Ammonite caching workaround (a796f0a) now that it's fixed * Changed ci/test-mill-0.sh to use interactive mode due to intermittent client failures to connect to server in travis * Added ci/test-mill-bootstrap.sh (ci/test-mill-0.sh with bootstrapping) and use it on oraclejdk9 instead of ci/test-mill-0.sh * Upgraded mill used for ci to 0.1.7-29-f5097f * revive #254 and fix #268 (#274) * Test mill batch (.bat) in AppVeyor * fix minor typos in docs * Sync Ammonite in ScalaModule (with build.sc).
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index e0e20fc7..bdbff76d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
env: CI_SCRIPT=ci/test-mill-dev.sh
jdk: oraclejdk9
- stage: build
- env: CI_SCRIPT=ci/test-mill-0.sh
+ env: CI_SCRIPT=ci/test-mill-bootstrap.sh
jdk: oraclejdk9
- stage: release
@@ -38,7 +38,7 @@ matrix:
jdk: oraclejdk8
script:
- - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-8-b913c6 && chmod +x ~/bin/mill
+ - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-29-f5097f && chmod +x ~/bin/mill
- export PATH=~/bin/mill:$PATH
- "$CI_SCRIPT"