From 2b470d73c2d55d286ef58a45c9bb0cab2d919598 Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Sun, 10 May 2020 10:05:18 +0200 Subject: [PATCH] Use rules in CI --- .gitlab-ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6013cfe..106b6fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,12 +33,9 @@ before_script: test: stage: test - only: - - branches - - merge_requests - - pushes - - tags - - master + rules: + changes: + - src/ script: - dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y node npm - make deps-install @@ -46,9 +43,9 @@ test: build: stage: build - only: - - tags - - merge_requests + rules: + - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' + - if: '$CI_COMMIT_TAG' script: - dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y gnome-shell gettext - make build