From 58a3e3bdb55834188469bca95ebeb44641f7fe32 Mon Sep 17 00:00:00 2001
From: 35V LG84 <35vlg84-x4e6b92@e257.fi>
Date: Sat, 28 Sep 2019 22:37:59 +0300
Subject: [PATCH] ci/cd: update images, add disabled codecov target

Disable coverage until sbt-scoverage is fixed:
https://github.com/scoverage/sbt-scoverage/issues/295

Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi>
---
 .gitlab-ci.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5e7e77..135de52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ cache:
     - "sbt-cache/sbtboot"
 
 test·jdk11:
-  image: "hseeberger/scala-sbt:11.0.2_2.12.8_1.2.8"
+  image: "hseeberger/scala-sbt:11.0.4_1.3.2_2.13.1"
 
   variables:
     SBT_OPTS: "-Dsbt.global.base=sbt-cache/sbtboot -Dsbt.boot.directory=sbt-cache/boot -Dsbt.ivy.home=sbt-cache/ivy"
@@ -20,11 +20,11 @@ test·jdk11:
   stage: "test"
 
   script:
-    - sbt clean "+ test"
+    - sbt "+clean" "+test"
 
 
 test·jdk8:
-  image: "hseeberger/scala-sbt:8u212_2.12.8_1.2.8"
+  image: "hseeberger/scala-sbt:8u222_1.3.2_2.13.1"
 
   variables:
     SBT_OPTS: "-Dsbt.global.base=sbt-cache/sbtboot -Dsbt.boot.directory=sbt-cache/boot -Dsbt.ivy.home=sbt-cache/ivy"
@@ -32,8 +32,20 @@ test·jdk8:
   stage: "test"
 
   script:
-    - sbt clean "+ test"
-    - sbt clean coverageOn test coverageReport
-    - sbt coverageAggregate
+    - sbt "+clean" "+test"
 
-  coverage: '/All done. Coverage was \[\d+.\d+%\]/'
+###
+### Disable coverate until 
+### https://github.com/scoverage/sbt-scoverage/issues/295 
+### is fixed
+###
+#codecov:
+#  image: "hseeberger/scala-sbt:8u222_1.3.2_2.13.1"
+#
+#  stage: "test"
+#
+#  script:
+#    - sbt "+clean" coverage "++2.13.1! test"
+#    - sbt "++2.13.1! coverageAggregate"
+#
+#  coverage: '/All done. Coverage was \[\d+.\d+%\]/'