diff options
author | Robby <robby@santoslab.org> | 2018-04-07 08:23:42 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-07 08:23:42 -0500 |
commit | ccb67db3759a16e95a75920d87281185310ccd81 (patch) | |
tree | b901d0173eaf48489583c9a905914baaaf3486ab /.appveyor.yml | |
parent | e628c84be7cf0b7bb00ba2141635d29503203fc4 (diff) | |
download | mill-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 '.appveyor.yml')
-rw-r--r-- | .appveyor.yml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 693bd85e..9a281405 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,6 +9,8 @@ clone_folder: c:\mill environment: matrix: + - COMPILER: default + JAVA_HOME: C:\Program Files\Java\jdk9 - COMPILER: cygwin CYGWIN_DIR: cygwin64 JAVA_HOME: C:\Program Files\Java\jdk9 @@ -17,26 +19,26 @@ environment: MSYS2_DIR: msys64 MSYSTEM: MINGW64 JAVA_HOME: C:\Program Files\Java\jdk1.8.0 - - COMPILER: msys2 - MSYS2_ARCH: x86_64 - MSYS2_DIR: msys64 - MSYSTEM: MINGW64 - JAVA_HOME: C:\Program Files\Java\jdk9 cache: - - '%LOCALAPPDATA%\Coursier\cache' + - '%LOCALAPPDATA%\Coursier\cache -> build.sc' install: - - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-8-b913c6 + - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-29-f5097f build_script: + - if [%COMPILER%]==[default] ( + SET "PATH=%JAVA_HOME%\bin;%PATH%" && + MD C:\bin && + curl -Lo C:\bin\mill.bat %MILL_URL% && + cmd /C C:\bin\mill.bat -i all __.publishLocal release && + cmd /C C:\mill\out\release\dest\mill.bat -i all main.test scalajslib.test) - if [%COMPILER%]==[msys2] ( SET "PATH=%JAVA_HOME%\bin;C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%" && C:\%MSYS2_DIR%\usr\bin\bash -lc 'mkdir -p /usr/local/bin' && C:\%MSYS2_DIR%\usr\bin\bash -lc "curl -Lo /usr/local/bin/mill %MILL_URL%" && C:\%MSYS2_DIR%\usr\bin\bash -lc 'chmod +x /usr/local/bin/mill' && C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && mill -i all __.publishLocal release" && - rd /s /q %USERPROFILE%\.mill && C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && out/release/dest/mill -i all main.test scalajslib.test") - if [%COMPILER%]==[cygwin] ( SET "PATH=%JAVA_HOME%\bin;C:\%CYGWIN_DIR%\bin;C:\%CYGWIN_DIR%\usr\bin;%PATH%" && |