From a7079e543fde4157f0428c5aa9475107c8d2d8d2 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Fri, 31 May 2019 11:06:21 +0200
Subject: [PATCH] Consolidate some pipeline stages

---
 rust-bindings/rust/.gitlab-ci.yml | 52 +++++++++++++------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/rust-bindings/rust/.gitlab-ci.yml b/rust-bindings/rust/.gitlab-ci.yml
index fa0ff107..c4dd55ad 100644
--- a/rust-bindings/rust/.gitlab-ci.yml
+++ b/rust-bindings/rust/.gitlab-ci.yml
@@ -21,42 +21,26 @@ cache:
   - sccache/
 
 stages:
-- check
 - build
 - publish
 
-# checks
+# format and freshness checks
 check:
-  stage: check
+  stage: build
   script:
-  - rustup component add clippy rustfmt
+  - rustup component add rustfmt
   - cargo fmt --all -- --check
-  - cargo clippy --all ${CURRENT_FEATURES} -- -D warnings
-
-gir:
-  stage: check
-  script:
   - rm -rf src/auto/
   - make gir
   - git diff -R --exit-code
 
-# ostree-sys
-ostree-sys:
-  stage: build
-  script:
-  - cargo test --verbose --manifest-path sys/Cargo.toml ${CURRENT_FEATURES}
-
-publish_ostree-sys:
-  stage: publish
-  script:
-  - cargo publish --verbose --manifest-path sys/Cargo.toml --token $CRATES_IO_TOKEN
-  cache: {}
-  when: manual
-
-# ostree
+# build
 ostree:
   stage: build
   script:
+  - rustup component add clippy
+  - cargo clippy --all ${CURRENT_FEATURES} -- -D warnings
+  - cargo test --verbose --manifest-path sys/Cargo.toml ${CURRENT_FEATURES}
   - cargo test --verbose ${CURRENT_FEATURES}
 
 ostree_default_features:
@@ -64,13 +48,6 @@ ostree_default_features:
   script:
   - cargo test --verbose
 
-publish_ostree:
-  stage: publish
-  script:
-  - cargo publish --verbose --token $CRATES_IO_TOKEN
-  cache: {}
-  when: manual
-
 # docs
 docs:
   stage: build
@@ -103,3 +80,18 @@ pages:
     - public
   only:
   - master
+
+# publish
+publish_ostree-sys:
+  stage: publish
+  script:
+  - cargo publish --verbose --manifest-path sys/Cargo.toml --token $CRATES_IO_TOKEN
+  cache: {}
+  when: manual
+
+publish_ostree:
+  stage: publish
+  script:
+  - cargo publish --verbose --token $CRATES_IO_TOKEN
+  cache: {}
+  when: manual