From a32ebe529ce4c4662e0fd9efd8ba48eb6a940a33 Mon Sep 17 00:00:00 2001 From: Arthur Vuillard Date: Fri, 7 Jul 2023 16:01:51 +0200 Subject: [PATCH] try to fix diff-cover --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f91f4..80014ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,8 +30,8 @@ tests: - pip install -U -r dev-requirements.txt - pytest --create-db --cov --cov-report=xml - if [ "$CI_COMMIT_REF_NAME" = 'main' ] ; then exit 0 ; fi - - if [ "$CI_COMMIT_REF_NAME" = 'develop' ] ; then git fetch origin main ; diff-cover coverage.xml --fail-under=90 --compare-branch origin/main && exit 0 ; fi - - git fetch origin develop ; diff-cover coverage.xml --fail-under=90 --compare-branch origin/develop + - if [ "$CI_COMMIT_REF_NAME" = 'develop' ] ; then git fetch origin main ; diff-cover coverage.xml --fail-under=90 --compare-branch origin/main --diff-range-notation '..' && exit 0 ; fi + - git fetch origin develop ; diff-cover coverage.xml --fail-under=90 --compare-branch origin/develop --diff-range-notation '..' - echo "Tests done." build_docker_and_publish: