From 03ef4256425cd2f96b2bd4cec3df14dde74850ef Mon Sep 17 00:00:00 2001 From: Emma Casolin Date: Tue, 7 Jun 2022 12:46:01 +1000 Subject: [PATCH] ci: syntax fixes for gitlab-ci.yml --- .gitlab-ci.yml | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ff15c0a86..e7b1bade41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,29 +94,24 @@ check:test-generate: check:test: stage: check - needs: [ + needs: - check:test-generate - ] - script: - - > - nix-shell --run ' - npm run build --verbose; - npm test -- --ci --coverage; - ' - artifacts: - when: always - reports: - junit: - - ./tmp/junit/junit.xml - coverage_report: - coverage_format: cobertura - path: ./tmp/coverage/cobertura-coverage.xml - coverage: '/All files[^|]*\|[^|]*\s+([\d\.]+)/' + inherit: + variables: false trigger: include: - artifact: tmp/test-pipelines.yml - job: test-generate + job: check:test-generate strategy: depend + # artifacts: + # when: always + # reports: + # junit: + # - ./tmp/junit/junit.xml + # coverage_report: + # coverage_format: cobertura + # path: ./tmp/coverage/cobertura-coverage.xml + # coverage: '/All files[^|]*\|[^|]*\s+([\d\.]+)/' rules: # Runs on staging commits and ignores version commits - if: $CI_COMMIT_BRANCH =~ /^feature.*$/ && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/