diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 471791a..8ab848c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,9 +36,12 @@ test: rules: - changes: - src/ - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' - - if: '$CI_COMMIT_TAG' - - if: '$CI_COMMIT_BRANCH == "master"' + - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH + changes: + - src/ + - if: $CI_COMMIT_TAG + changes: + - src/ script: - dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y node npm - make deps-install @@ -47,8 +50,8 @@ test: build: stage: build rules: - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' - - if: '$CI_COMMIT_TAG' + - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_TAG script: - dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y gnome-shell gettext - make build