From: Ray Strode <rstrode@redhat.com>
Date: Tue, 29 Nov 2022 19:46:08 +0000 (-0500)
Subject: ci: Fix check-format
X-Git-Tag: 23.51.283~41^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bce1df280733533e9d7d774d56e6cfbc35c8a0a;p=thirdparty%2Fplymouth.git

ci: Fix check-format

In commit bb6580212d45f9ab0a459a9335aec2ff20818a6e we tried to stop
running check-format on debian. We did this by moving the check-format
details to its own map and then adding a "<<" merge key to only pull
it in on Fedora.

The Fedora map already has a "<<" merge key however for doing the actual
build.

It's not allowed for their to be two, and gitlab's ci just ignores
the second one.

This commit combines the merge keys into one.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30fbb3b4..4ba20ead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,7 @@ fedora-x86_64:
   before_script:
     - dnf install -y gcc 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 uncrustify patchutils meson binutils-gold xkeyboard-config-devel libevdev-devel
     - alternatives --set ld /usr/bin/ld.gold
-  <<: *check-format
-  <<: *meson-build
+  <<: [ *check-format, *meson-build ]
   only:
     - merge_requests