summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-01-12 07:38:24 -0500
committerMatthias Clasen <mclasen@redhat.com>2021-01-12 10:34:07 -0500
commite70c4f334e1eeb7d139148c9ac10db41613be10c (patch)
tree72ca6b3fb87c629c277e143f06e52ba3bf8ba6fa
parent078c2d5e80fed7edce4d2391dae3c3441f37ce5a (diff)
downloadpango-e70c4f334e1eeb7d139148c9ac10db41613be10c.tar.gz
ci: Specify 'only' for other jobsci-no-detached-builds
Otherwise MRs will only run macOS jobs.
-rw-r--r--.gitlab-ci.yml15
1 files changed, 12 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20ecadc1..724459de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,14 @@ variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 2
FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v4
+.only-default:
+ only:
+ - branches
+ except:
+ - tags
+
linux-fedora:
+ extends: .only-default
image: $FEDORA_IMAGE
stage: build
needs: []
@@ -35,6 +42,7 @@ linux-fedora:
- "${CI_PROJECT_DIR}/_build/fontlist.txt"
asan-build:
+ extends: .only-default
image: $FEDORA_IMAGE
tags: [ asan ]
stage: analysis
@@ -58,6 +66,7 @@ asan-build:
- "${CI_PROJECT_DIR}/_build/fontlist.txt"
msys2-mingw64:
+ extends: .only-default
stage: build
needs: []
tags:
@@ -79,12 +88,12 @@ msys2-mingw64:
- "${CI_PROJECT_DIR}/_build/fontlist.txt"
macos:
+ extends: .only-default
+ only:
+ - branches@GNOME/pango
stage: build
tags:
- macos
- only:
- - master
- - merge_requests
needs: []
before_script:
- pip3 install --user meson==0.56