diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2019-07-01 11:04:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 11:04:38 -0700 |
| commit | e0a3bbe716b67624eaf3c327ea1e433c6c481213 (patch) | |
| tree | 4a7d060e08107bde95ccf7851e75dbdba856e32a /ci | |
| parent | 6ef8409312b86676b715c9564efe84d6de2bc825 (diff) | |
| download | mill-e0a3bbe716b67624eaf3c327ea1e433c6c481213.tar.gz mill-e0a3bbe716b67624eaf3c327ea1e433c6c481213.tar.bz2 mill-e0a3bbe716b67624eaf3c327ea1e433c6c481213.zip | |
Fix build, split up release and assembly (#643)
* .
* .
* use non-version-changing executable for integration tests
* Update test-mill-1.sh
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/publish-local.sh | 4 | ||||
| -rwxr-xr-x | ci/release.sh | 4 | ||||
| -rwxr-xr-x | ci/test-mill-0.sh | 2 | ||||
| -rwxr-xr-x | ci/test-mill-1.sh | 4 | ||||
| -rwxr-xr-x | ci/test-mill-2.sh | 4 | ||||
| -rwxr-xr-x | ci/test-mill-bootstrap.sh | 2 | ||||
| -rwxr-xr-x | ci/test-mill-dev.sh | 2 |
7 files changed, 12 insertions, 10 deletions
diff --git a/ci/publish-local.sh b/ci/publish-local.sh index c137340d..6342125e 100755 --- a/ci/publish-local.sh +++ b/ci/publish-local.sh @@ -2,6 +2,6 @@ set -eux -mill -i all __.publishLocal release +./mill -i all __.publishLocal executable -mv out/release/dest/mill ~/mill-release +mv out/executable/dest/mill ~/mill-release diff --git a/ci/release.sh b/ci/release.sh index 28768dc0..ee0deaf8 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -8,7 +8,7 @@ gpg --import gpg_key rm gpg_key -mill mill.scalalib.PublishModule/publishAll \ +./mill mill.scalalib.PublishModule/publishAll \ lihaoyi:$SONATYPE_PASSWORD \ $GPG_PASSWORD \ __.publishArtifacts \ @@ -16,4 +16,4 @@ mill mill.scalalib.PublishModule/publishAll \ true -mill uploadToGithub $GITHUB_ACCESS_TOKEN +./mill uploadToGithub $GITHUB_ACCESS_TOKEN diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh index 83c361b1..e8536920 100755 --- a/ci/test-mill-0.sh +++ b/ci/test-mill-0.sh @@ -7,4 +7,4 @@ git clean -xdf # Run tests -mill -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.playlib,main.client,contrib.scalapblib,contrib.flyway,contrib.scoverage}.test
\ No newline at end of file +./mill -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.playlib,main.client,contrib.scalapblib,contrib.flyway,contrib.scoverage}.test
\ No newline at end of file diff --git a/ci/test-mill-1.sh b/ci/test-mill-1.sh index b0ed7bc2..df2261bd 100755 --- a/ci/test-mill-1.sh +++ b/ci/test-mill-1.sh @@ -6,4 +6,6 @@ set -eux git clean -xdf # Run tests -mill integration.test "mill.integration.local.{JawnTests,BetterFilesTests,UpickleTests}" +./mill integration.test "mill.integration.local.JawnTests" +./mill integration.test "mill.integration.local.BetterFilesTests" +./mill integration.test "mill.integration.local.UpickleTests" diff --git a/ci/test-mill-2.sh b/ci/test-mill-2.sh index 83eef7a3..134febc1 100755 --- a/ci/test-mill-2.sh +++ b/ci/test-mill-2.sh @@ -5,6 +5,6 @@ set -eux # Starting from scratch... git clean -xdf -mill contrib.testng.publishLocal # Needed for CaffeineTests +./mill contrib.testng.publishLocal # Needed for CaffeineTests # Run tests -mill integration.test "mill.integration.local.{AcyclicTests,AmmoniteTests,DocAnnotationsTests}" +./mill integration.test "mill.integration.local.{AcyclicTests,AmmoniteTests,DocAnnotationsTests}" diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh index 80086df2..f5100663 100755 --- a/ci/test-mill-bootstrap.sh +++ b/ci/test-mill-bootstrap.sh @@ -6,7 +6,7 @@ set -eux git clean -xdf # First build -mill -i all __.publishLocal release +./mill -i all __.publishLocal release mv out/release/dest/mill ~/mill-1 # Clean up diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh index 1a5c5243..d81fe0df 100755 --- a/ci/test-mill-dev.sh +++ b/ci/test-mill-dev.sh @@ -6,7 +6,7 @@ set -eux git clean -xdf # Build Mill -mill -i dev.assembly +./mill -i dev.assembly rm -rf ~/.mill |