summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2020-11-03 00:24:17 +0100
committerBenjamin Berg <benjamin@sipsolutions.net>2020-12-11 09:30:21 +0000
commit1dbadb9326bc18c06cd06504c46f16f41302753f (patch)
tree98051744effec1fb3779de676e74067aabb29ed0 /.gitlab-ci.yml
parent3bd47c0cfc5de40f4688443a2696c8a2d1033493 (diff)
downloadgnome-settings-daemon-1dbadb9326bc18c06cd06504c46f16f41302753f.tar.gz
ci: Update CI template and runner tags
The new FDO templates do not need privileged runners anymore. Also, those do not exist and the asan should be run on the asan runner instead.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 346f189e..89e54681 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
include:
- - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/59de540b620c45739871d1a073d76d5521989d11/templates/fedora.yml'
+ - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/5888c7388134cbe4661600222fe9befb10441f6e/templates/fedora.yml'
variables:
FDO_DISTRIBUTION_TAG: latest
@@ -217,7 +217,7 @@ pages:
asan:
<<: *sanitizer
# ASAN requires debugging capabilities
- tags: [ privileged ]
+ tags: [ asan ]
variables:
BUILD_OPTS: "-Db_sanitize=address"
@@ -243,10 +243,7 @@ msan:
# See also https://gitlab.freedesktop.org/freedesktop/ci-templates
container_fedora_build:
- tags: [ privileged ]
extends: .fdo.container-build@fedora
- # The templates reference the local registry, but we need the fdo one
- image: registry.freedesktop.org/freedesktop/ci-templates/buildah:2020-03-24
only:
variables:
- $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"