Commit 069e8f0f authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '21-merge_coverage-cannot-find-ng-coverage-cobertura-xml-report' into 'master' 

Resolve "merge_coverage cannot find ng-coverage.cobertura.xml report"

Closes #21

See merge request to-be-continuous/angular!33
parents b73ecf15 9dea3365

templates/gitlab-ci-angular.yml

+3 −3
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ stages: 
  }



  function merge_coverage() {

    reports=$(ls reports/**/ng-coverage*.cobertura.xml)

    reports=$(find reports/ -type f -iname "ng-coverage*.cobertura.xml")

    reports_count=$(echo "$reports" | wc -l)

    if [[ ${reports_count} -gt 1 ]]; then

      log_info "merging ${reports_count} Cobertura reports into one..."
@@ -496,8 +496,8 @@ ng-build: 
    name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"

    paths:

      - $NG_WORKSPACE_DIR/dist

      - $NG_WORKSPACE_DIR/reports/**/ng-test*"

      - $NG_WORKSPACE_DIR/reports/**/ng-coverage*"

      - "$NG_WORKSPACE_DIR/reports/**/ng-test*"

      - "$NG_WORKSPACE_DIR/reports/**/ng-coverage*"

    expire_in: 1 day



###############################################################################################