diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fde7b6e..2da6cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,11 +41,10 @@ build:apt: interruptible: true stage: build rules: - - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_TAG variables: VERSION: $CI_COMMIT_REF_NAME - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) changes: - app/**/* - .DEBIAN/**/* @@ -89,11 +88,10 @@ build:pacman: interruptible: true stage: build rules: - - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_TAG variables: VERSION: $CI_COMMIT_REF_NAME - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) changes: - app/**/* - .PKGBUILD/**/*