summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-25 22:33:23 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-26 00:00:29 -0800
commit2a59977d9c4aa23513d2c38a9fa151f9c11e8dc0 (patch)
tree6a16d7db4538e73c1fe53f2fda812f2d12e71cf8 /ci
parent08e27d9b94e38f64f6680828c64ab3c0a8f5537f (diff)
downloadmill-2a59977d9c4aa23513d2c38a9fa151f9c11e8dc0.tar.gz
mill-2a59977d9c4aa23513d2c38a9fa151f9c11e8dc0.tar.bz2
mill-2a59977d9c4aa23513d2c38a9fa151f9c11e8dc0.zip
Delete SBT build, use Mill for CI & development
Also re-organize the test matrix to split out the unit & integration tests into 3 separate builds, and removing the integration tests from the `-dev` and `-mill` jobs. That should speed up the test run while running all tests and ensuring the dev/release assemblies work
Diffstat (limited to 'ci')
-rwxr-xr-xci/publish-local.sh8
-rwxr-xr-xci/release.sh6
-rwxr-xr-xci/test-mill-0.sh9
-rwxr-xr-xci/test-mill-1.sh9
-rwxr-xr-xci/test-mill-2.sh9
-rwxr-xr-xci/test-mill-built.sh18
-rwxr-xr-xci/test-mill-dev.sh13
-rwxr-xr-xci/test-mill-release.sh4
-rwxr-xr-xci/test-sbt-built.sh13
-rwxr-xr-xci/test-sbt.sh11
10 files changed, 45 insertions, 55 deletions
diff --git a/ci/publish-local.sh b/ci/publish-local.sh
index 0d7559e3..fc9e06b9 100755
--- a/ci/publish-local.sh
+++ b/ci/publish-local.sh
@@ -2,10 +2,6 @@
set -eux
-# First build using SBT
-sbt bin/test:assembly
+mill all __.publishLocal release
-# Build Mill using SBT
-target/bin/mill all __.publishLocal release
-
-mv out/release/dest/out.jar ~/mill-release
+mv out/release/dest/mill ~/mill-release
diff --git a/ci/release.sh b/ci/release.sh
index a233ad4d..9072ce96 100755
--- a/ci/release.sh
+++ b/ci/release.sh
@@ -2,14 +2,12 @@
set -eux
-sbt bin/test:assembly
-
echo $GPG_PRIVATE_KEY_B64 | base64 --decode > gpg_key
gpg --import gpg_key
rm gpg_key
-target/bin/mill mill.scalalib.PublishModule/publishAll \
+mill mill.scalalib.PublishModule/publishAll \
lihaoyi:$SONATYPE_PASSWORD \
$GPG_PASSWORD \
__.publishArtifacts \
@@ -17,4 +15,4 @@ target/bin/mill mill.scalalib.PublishModule/publishAll \
true \
-target/bin/mill uploadToGithub $GITHUB_ACCESS_TOKEN
+mill uploadToGithub $GITHUB_ACCESS_TOKEN
diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh
new file mode 100755
index 00000000..3d1470f1
--- /dev/null
+++ b/ci/test-mill-0.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Starting from scratch...
+git clean -xdf
+
+# Run tests using Mill built using SBT
+mill all {clientserver,main,scalalib,scalajslib}.test
diff --git a/ci/test-mill-1.sh b/ci/test-mill-1.sh
new file mode 100755
index 00000000..079cb519
--- /dev/null
+++ b/ci/test-mill-1.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Starting from scratch...
+git clean -xdf
+
+# Run tests using Mill built using SBT
+mill integration.test "mill.integration.local.{JawnTests,BetterFilesTests,UpickleTests}"
diff --git a/ci/test-mill-2.sh b/ci/test-mill-2.sh
new file mode 100755
index 00000000..3b0da706
--- /dev/null
+++ b/ci/test-mill-2.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Starting from scratch...
+git clean -xdf
+
+# Run tests using Mill built using SBT
+mill integration.test "mill.integration.local.{AcyclicTests,AmmoniteTests}"
diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh
deleted file mode 100755
index 85879106..00000000
--- a/ci/test-mill-built.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-# Starting from scratch...
-git clean -xdf
-
-ci/publish-local.sh
-
-# Build Mill using SBT
-target/bin/mill dev.assembly
-
-# Second build & run tests using Mill
-
-
-out/dev/assembly/dest/out.jar -i all {clientserver,main,scalalib,scalajslib}.test
-out/dev/assembly/dest/out.jar -i integration.test "mill.integration.forked.{AmmoniteTests,BetterFilesTests}"
-out/dev/assembly/dest/out.jar -i dev.assembly
diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh
new file mode 100755
index 00000000..cb83ef00
--- /dev/null
+++ b/ci/test-mill-dev.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Starting from scratch...
+git clean -xdf
+
+# Build Mill using SBT
+mill dev.assembly
+
+# Second build & run tests using Mill
+out/dev/assembly/dest/mill -i all {clientserver,main,scalalib,scalajslib}.test
+
diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh
index 838d1960..3c70410b 100755
--- a/ci/test-mill-release.sh
+++ b/ci/test-mill-release.sh
@@ -11,6 +11,4 @@ git clean -xdf
# Second build & run tests using Mill
-~/mill-release all {clientserver,main,scalalib,scalajslib}.test
-~/mill-release integration.test "mill.integration.forked.{AcyclicTests,JawnTests,UpickleTests}"
-~/mill-release dev.assembly
+~/mill-release integration.test "mill.integration.forked.{AcyclicTests,UpickleTests}"
diff --git a/ci/test-sbt-built.sh b/ci/test-sbt-built.sh
deleted file mode 100755
index 3a85d345..00000000
--- a/ci/test-sbt-built.sh
+++ /dev/null
@@ -1,13 +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 {clientserver,main,scalalib,scalajslib}.test
-target/bin/mill integration.test "mill.integration.local.{AcyclicTests,JawnTests,UpickleTests}"
-target/bin/mill dev.assembly
diff --git a/ci/test-sbt.sh b/ci/test-sbt.sh
deleted file mode 100755
index a57b06e2..00000000
--- a/ci/test-sbt.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 clientserver/test main/test scalalib/test scalajslib/test
-sbt "integration/test-only -- mill.integration.local.{AmmoniteTests,BetterFilesTests}"
-sbt bin/test:assembly