From 00d0f979e2facd2c5d12d06dd2dc70c0b14c3c1f Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 4 Feb 2018 20:41:28 -0800 Subject: Cleanup --- ci/release.sh | 9 ++++++--- ci/test-mill-built.sh | 19 +++++++++++++++++++ ci/test-mill-release.sh | 31 +++++++++++++++++++++++++++++++ ci/test-sbt-built.sh | 14 ++++++++++++++ ci/test-sbt.sh | 11 +++++++++++ ci/test1.sh | 11 ----------- ci/test2.sh | 14 -------------- ci/test3.sh | 19 ------------------- ci/test4.sh | 31 ------------------------------- 9 files changed, 81 insertions(+), 78 deletions(-) create mode 100755 ci/test-mill-built.sh create mode 100755 ci/test-mill-release.sh create mode 100755 ci/test-sbt-built.sh create mode 100755 ci/test-sbt.sh delete mode 100755 ci/test1.sh delete mode 100755 ci/test2.sh delete mode 100755 ci/test3.sh delete mode 100755 ci/test4.sh (limited to 'ci') diff --git a/ci/release.sh b/ci/release.sh index 892e8e49..18bfc399 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -2,7 +2,10 @@ set -eux -echo $GPG_PRIVATE_KEY_B64 | base64 --decode > ~/gpg.key -gpg import ~/gpg.key -target/bin/mill releaseCI $GITHUB_ACCESS_TOKEN lihaoyi:$SONATYPE_PASSWORD $GPG_PASSWORD + +target/bin/mill releaseCI \ + $GITHUB_ACCESS_TOKEN \ + lihaoyi:$SONATYPE_PASSWORD \ + $GPG_PASSWORD \ + $GPG_PRIVATE_KEY_B64 diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh new file mode 100755 index 00000000..5b3b1a28 --- /dev/null +++ b/ci/test-mill-built.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + +# First build using SBT +sbt bin/test:assembly + +# Build Mill using SBT +target/bin/mill devAssembly + +# Second build & run tests using Mill + +out/devAssembly/dest/out.jar --all {core,scalalib,scalajslib}.test devAssembly +out/devAssembly/dest/out.jar integration.test mill.integration.AmmoniteTests +out/devAssembly/dest/out.jar integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" +out/devAssembly/dest/out.jar devAssembly diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh new file mode 100755 index 00000000..52fc053d --- /dev/null +++ b/ci/test-mill-release.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + +# First build using SBT +sbt bin/test:assembly + +# Build Mill using SBT +target/bin/mill --all \ + moduledefs.publishLocal \ + core.publishLocal \ + scalalib.publishLocal \ + scalaworker.publishLocal \ + scalajslib.publishLocal \ + scalajslib.jsbridges[0.6].publishLocal \ + scalajslib.jsbridges[1.0].publishLocal \ + releaseAssembly + +mv out/releaseAssembly/dest/out.jar ~/mill-release + +git clean -xdf + +# Second build & run tests using Mill + +~/mill-release --all {core,scalalib,scalajslib}.test devAssembly +~/mill-release integration.test mill.integration.AmmoniteTests +~/mill-release integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" +~/mill-release devAssembly diff --git a/ci/test-sbt-built.sh b/ci/test-sbt-built.sh new file mode 100755 index 00000000..ebb3ddb5 --- /dev/null +++ b/ci/test-sbt-built.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + +sbt bin/test:assembly + +# Run tests using Mill built using SBT +target/bin/mill --all {core,scalalib,scalajslib}.test devAssembly +target/bin/mill integration.test mill.integration.AmmoniteTests +target/bin/mill integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" +target/bin/mill devAssembly diff --git a/ci/test-sbt.sh b/ci/test-sbt.sh new file mode 100755 index 00000000..f77456f7 --- /dev/null +++ b/ci/test-sbt.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + +# First build & run tests using SBT +sbt core/test scalalib/test scalajslib/test +sbt integration/test +sbt bin/test:assembly diff --git a/ci/test1.sh b/ci/test1.sh deleted file mode 100755 index f77456f7..00000000 --- a/ci/test1.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# Starting from scratch... -git clean -xdf - -# First build & run tests using SBT -sbt core/test scalalib/test scalajslib/test -sbt integration/test -sbt bin/test:assembly diff --git a/ci/test2.sh b/ci/test2.sh deleted file mode 100755 index ebb3ddb5..00000000 --- a/ci/test2.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# Starting from scratch... -git clean -xdf - -sbt bin/test:assembly - -# Run tests using Mill built using SBT -target/bin/mill --all {core,scalalib,scalajslib}.test devAssembly -target/bin/mill integration.test mill.integration.AmmoniteTests -target/bin/mill integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" -target/bin/mill devAssembly diff --git a/ci/test3.sh b/ci/test3.sh deleted file mode 100755 index 5b3b1a28..00000000 --- a/ci/test3.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# Starting from scratch... -git clean -xdf - -# First build using SBT -sbt bin/test:assembly - -# Build Mill using SBT -target/bin/mill devAssembly - -# Second build & run tests using Mill - -out/devAssembly/dest/out.jar --all {core,scalalib,scalajslib}.test devAssembly -out/devAssembly/dest/out.jar integration.test mill.integration.AmmoniteTests -out/devAssembly/dest/out.jar integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" -out/devAssembly/dest/out.jar devAssembly diff --git a/ci/test4.sh b/ci/test4.sh deleted file mode 100755 index 52fc053d..00000000 --- a/ci/test4.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# Starting from scratch... -git clean -xdf - -# First build using SBT -sbt bin/test:assembly - -# Build Mill using SBT -target/bin/mill --all \ - moduledefs.publishLocal \ - core.publishLocal \ - scalalib.publishLocal \ - scalaworker.publishLocal \ - scalajslib.publishLocal \ - scalajslib.jsbridges[0.6].publishLocal \ - scalajslib.jsbridges[1.0].publishLocal \ - releaseAssembly - -mv out/releaseAssembly/dest/out.jar ~/mill-release - -git clean -xdf - -# Second build & run tests using Mill - -~/mill-release --all {core,scalalib,scalajslib}.test devAssembly -~/mill-release integration.test mill.integration.AmmoniteTests -~/mill-release integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests}" -~/mill-release devAssembly -- cgit v1.2.3