From 2a1a43ea2f8643138ca4ff404530b5f7fd27c0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@collabora.com>
Date: Mon, 31 Jan 2022 19:38:06 +0100
Subject: [PATCH] ci: create rustfmt-clippy

To save precious time, run clippy and fmt in the same
run.
---
 .gitlab-ci.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19f5fb6..2e809fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ build-fedora-container:
     FDO_DISTRIBUTION_EXEC: >-
       pip3 install meson
 
-rustfmt:
+rustfmt-clippy:
   extends:
     - .fedora
     - .fdo.distribution-image@fedora
@@ -56,6 +56,8 @@ rustfmt:
     - meson build
     - cargo fmt --version
     - cargo fmt -- --color=always --check
+    - cargo clippy --version
+    - cargo clippy --color=always --all-targets -- -D warnings
 
 test-stable:
   extends:
@@ -82,16 +84,6 @@ rustdoc:
     - rustdoc --version
     - cargo doc --no-deps
 
-clippy:
-  extends:
-    - .fedora
-    - .fdo.distribution-image@fedora
-  stage: extras
-  script:
-    - meson build
-    - cargo clippy --version
-    - cargo clippy --color=always --all-targets -- -D warnings
-
 flatpak:
   image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:41"
   stage: test