From e9c449e8ca4493da48918f37f0039f594a98ef91 Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Fri, 13 Apr 2018 19:23:22 +0200 Subject: [PATCH 1/2] Merge Bootstrapped and IDE Test IDE test currently take no more than 40s to run. Most of the time is spent compiling dotty-compiler and starting sbt. Running them with the bootstrapped tests in the CI saves us the time spent starting sbt and compiling dotty-compiler (done once for both). --- .drone.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4d063a8a49ef..4c9e9b8cef55 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ pipeline: image: lampepfl/dotty:2018-04-10 commands: - cp -R . /tmp/2/ && cd /tmp/2/ - - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test" + - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test; dotty-language-server/test" test_optimised: group: test @@ -43,18 +43,11 @@ pipeline: - cp -R . /tmp/3/ && cd /tmp/3/ - ./project/scripts/sbt dotty-optimised/test - test_ide: - group: test - image: lampepfl/dotty:2018-04-10 - commands: - - cp -R . /tmp/4/ && cd /tmp/4/ - - ./project/scripts/sbt dotty-language-server/test - test_sbt: group: test image: lampepfl/dotty:2017-11-17 commands: - - cp -R . /tmp/5/ && cd /tmp/5/ + - cp -R . /tmp/4/ && cd /tmp/4/ - ./project/scripts/sbt sbt-dotty/scripted when: # sbt scripted tests are slow and only run on nightly or deployment From efb61bc1528d30a32126b5c3743d45eaeb1e173b Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Fri, 13 Apr 2018 19:28:59 +0200 Subject: [PATCH 2/2] Fix image docker image for scripted tests --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4c9e9b8cef55..64669e1df313 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,7 +45,7 @@ pipeline: test_sbt: group: test - image: lampepfl/dotty:2017-11-17 + image: lampepfl/dotty:2018-04-10 commands: - cp -R . /tmp/4/ && cd /tmp/4/ - ./project/scripts/sbt sbt-dotty/scripted