From: Ray Strode Date: Mon, 4 Apr 2022 20:21:39 +0000 (-0400) Subject: .gitlab-ci: Make it work better on merge requests X-Git-Tag: 23.51.283~90^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=651c22f11ac6674e7591fe1f35dc0c0de5f22cee;p=thirdparty%2Fplymouth.git .gitlab-ci: Make it work better on merge requests gitlab CI apparently exposes more useful environment variables if `only: merge_requests` is put on each job, so do that. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c92ca7d..f7ecf28e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,8 @@ fedora-x86_64: before_script: - dnf install -y gcc libtool intltool gtk3-devel git libpng-devel gettext-devel libxslt docbook-style-xsl cairo-devel systemd-devel systemd-udev kernel-headers libdrm-devel pango-devel make ShellCheck <<: *autotools-build + only: + - merge_requests debian-stable-x86_64: stage: build @@ -25,3 +27,5 @@ debian-stable-x86_64: - apt-get update -qq - apt-get install -y -qq --no-install-recommends autoconf automake autopoint bc build-essential docbook-xsl gcc gettext git intltool libdrm-dev libgtk-3-dev libpango1.0-dev libpng-dev libtool libudev-dev make pkg-config libsystemd-dev udev xsltproc shellcheck <<: *autotools-build + only: + - merge_requests