Skip to content

Commit

Permalink
ci/cd: update images, add disabled codecov target
Browse files Browse the repository at this point in the history
Disable coverage until sbt-scoverage is fixed:
scoverage/sbt-scoverage#295

Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi>
  • Loading branch information
35VLG84 committed Sep 28, 2019
1 parent 986e231 commit 58a3e3b
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,40 @@ 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"

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"

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+%\]/'

0 comments on commit 58a3e3b

Please sign in to comment.