diff options
author | Ray Strode <halfline@gmail.com> | 2022-11-29 19:57:19 +0000 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2022-11-29 19:57:19 +0000 |
commit | a3f9824d9a3f894eae4f7b9dd720fc3c1eb11ecc (patch) | |
tree | 4c14d60e35f216b0bfca695c87c5c92b72cd66ef | |
parent | 970ba688f4278d9d723a968cababe02f4976aca2 (diff) | |
parent | 9bce1df280733533e9d7d774d56e6cfbc35c8a0a (diff) |
Merge branch 'fix-check-format' into 'main'
ci: Fix check-format
See merge request plymouth/plymouth!217
-rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 1 insertions, 2 deletions
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 |