From 0b11197c99caa61213ffccbc03b913b5a148d426 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 10 Apr 2018 13:41:59 -0700 Subject: [PATCH] drop back down to publishing using bootstrap mill now that bootstrapping has been fixed --- .appveyor.yml | 2 +- .travis.yml | 2 +- ci/release.sh | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index bd92c17e2f0..632c11ecdf2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,7 +24,7 @@ cache: - '%LOCALAPPDATA%\Coursier\cache -> build.sc' install: - - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-86-e1da1b + - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-97-00b10e build_script: - if [%COMPILER%]==[default] ( diff --git a/.travis.yml b/.travis.yml index 5281fcbfd40..99d96bf2805 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: jdk: oraclejdk8 script: - - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-86-e1da1b && chmod +x ~/bin/mill + - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-97-00b10e && chmod +x ~/bin/mill - export PATH=~/bin/mill:$PATH - "$CI_SCRIPT" diff --git a/ci/release.sh b/ci/release.sh index 155614d9c20..28768dc0458 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -7,9 +7,8 @@ echo $GPG_PRIVATE_KEY_B64 | base64 --decode > gpg_key gpg --import gpg_key rm gpg_key -ci/publish-local.sh -~/mill-release mill.scalalib.PublishModule/publishAll \ +mill mill.scalalib.PublishModule/publishAll \ lihaoyi:$SONATYPE_PASSWORD \ $GPG_PASSWORD \ __.publishArtifacts \ @@ -17,4 +16,4 @@ ci/publish-local.sh true -~/mill-release uploadToGithub $GITHUB_ACCESS_TOKEN +mill uploadToGithub $GITHUB_ACCESS_TOKEN