Use rules in CI

This commit is contained in:
Romain Vigier
2020-05-10 10:05:18 +02:00
parent a0f8aac8fa
commit 2b470d73c2
+6 -9
View File
@@ -33,12 +33,9 @@ before_script:
test: test:
stage: test stage: test
only: rules:
- branches changes:
- merge_requests - src/
- pushes
- tags
- master
script: script:
- dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y node npm - dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y node npm
- make deps-install - make deps-install
@@ -46,9 +43,9 @@ test:
build: build:
stage: build stage: build
only: rules:
- tags - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
- merge_requests - if: '$CI_COMMIT_TAG'
script: script:
- dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y gnome-shell gettext - dnf --setopt=cachedir=$(pwd)/.dnf_cache --setopt=keepcache=True install -y gnome-shell gettext
- make build - make build