From 9cc010127b0b631c838db666200f293d0cf9ac37 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 12 Jan 2018 20:56:11 -0800 Subject: split up travis build into 3 workers, one testing each stage of the bootstrapping --- .travis.yml | 9 +++++++-- ci/test.sh | 12 ++++++++++++ ci/test2.sh | 15 +++++++++++++++ ci/test3.sh | 19 +++++++++++++++++++ test.sh | 21 --------------------- 5 files changed, 53 insertions(+), 23 deletions(-) create mode 100755 ci/test.sh create mode 100755 ci/test2.sh create mode 100755 ci/test3.sh delete mode 100755 test.sh diff --git a/.travis.yml b/.travis.yml index 48e40753..3e26f15f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,14 @@ scala: jdk: - oraclejdk8 -script: - - "./test.sh" +matrix: + include: + - env: CI_SCRIPT=ci/test.sh + - env: CI_SCRIPT=ci/test2.sh + - env: CI_SCRIPT=ci/test3.sh +script: + - "$CI_SCRIPT" cache: directories: - $HOME/.sbt/0.13/dependency diff --git a/ci/test.sh b/ci/test.sh new file mode 100755 index 00000000..b03523e1 --- /dev/null +++ b/ci/test.sh @@ -0,0 +1,12 @@ +#!/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 new file mode 100755 index 00000000..2ab4bca2 --- /dev/null +++ b/ci/test2.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + + +sbt bin/test:assembly +# Run tests using +bin/target/mill core.test +bin/target/mill scalalib.test +bin/target/mill scalajslib.test +bin/target/mill integration.test +bin/target/mill devAssembly diff --git a/ci/test3.sh b/ci/test3.sh new file mode 100755 index 00000000..91ce02b3 --- /dev/null +++ b/ci/test3.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -eux + +# Starting from scratch... +git clean -xdf + +# First build & run tests using SBT +sbt bin/test:assembly + +# Build Mill using SBT +bin/target/mill devAssembly + +# Second build & run tests using Mill +out/devAssembly/dest core.test +out/devAssembly/dest scalalib.test +out/devAssembly/dest scalajslib.test +out/devAssembly/dest integration.test +out/devAssembly/dest devAssembly diff --git a/test.sh b/test.sh deleted file mode 100755 index 916a5d78..00000000 --- a/test.sh +++ /dev/null @@ -1,21 +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 - -# Build Mill using SBT -bin/target/mill devAssembly - -# Second build & run tests using Mill -out/devAssembly/dest core.test -out/devAssembly/dest scalalib.test -out/devAssembly/dest scalajslib.test -out/devAssembly/dest integration.test -out/devAssembly/dest devAssembly -- cgit v1.2.3