diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1be000d8995a45e155376a8ffeca264303e3e9d3..02ce72e486648a1658c09049fa44cbb67f473a41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: image: gradle:jdk8 stage: build script: - - ./gradlew --console=plain --build-cache assemble + - ./gradlew --console=plain --build-cache assemble cache: key: "$CI_COMMIT_REF_NAME" policy: push @@ -26,7 +26,7 @@ test: image: gradle:jdk8 stage: test script: - - ./gradlew --continue --console=plain check jacocoTestReport + - ./gradlew --continue --console=plain check jacocoTestReport cache: key: "$CI_COMMIT_REF_NAME" policy: pull @@ -35,10 +35,8 @@ test: - .gradle artifacts: when: always - paths: - - $TEST_REPORTS - # - $JACOCO_DATA1 - # - $JACOCO_DATA2 + paths: + - $TEST_REPORTS coverage: image: python:3.7.1-stretch @@ -46,9 +44,9 @@ coverage: dependencies: - test script: - # - ./gradlew --continue --console=plain -x test - - pip install --user untangle - - python2 print-coverage.py +# - ./gradlew --continue --console=plain -x test jacocoTestReport + - pip install --user untangle + - python2 print-coverage.py coverage: "/Covered (\\d{1,3}\\.\\d{2}%) of instructions for all projects\\./" cache: key: "$CI_COMMIT_REF_NAME" @@ -57,7 +55,3 @@ coverage: - build - .gradle allow_failure: true - artifacts: - when: always - # paths: - # - $COVERAGE_REPORTS