diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8741c838a..6cc09448f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -213,9 +213,11 @@ test_api: image: $CI_REGISTRY/funkwhale/backend-test-docker:$PY_VER coverage: '/TOTAL\s*\d*\s*\d*\s*(\d*%)/' rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push" changes: - api/**/* + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: always test_front: interruptible: true @@ -241,9 +243,11 @@ test_front: tags: - docker rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push" changes: - front/**/* + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: always build_docs: stage: build