From c0aeee990c276968b71315379890cd4a28c33e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lo=C3=AFs?= <elois@ifee.fr>
Date: Thu, 19 Apr 2018 21:01:33 +0000
Subject: [PATCH] [fix] #61 pass-fmt-job-to-stable-version
---
.gitlab-ci.yml | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96e9fa12..4ebfc6d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
stages:
- build_and_tests
- - clippy
- fmt
+ - clippy
before_script:
- export PATH="$HOME/.cargo/bin:$PATH"
@@ -32,27 +32,24 @@ build_and_tests:nightly:
- cargo test --all-features
when: manual
allow_failure: true
-
-clippy:
- stage: clippy
- image: rustlang/rust:nightly
+
+fmt:
+ stage: fmt
tags:
- - redshift-rs-nightly
+ - redshift-rs-stable
before_script:
- export PATH="$HOME/.cargo/bin:$PATH"
- - cargo install --force clippy --verbose
script:
- - cargo clippy --all -- -D warnings --verbose
- allow_failure: true
+ - cargo fmt --force --all -- --write-mode=diff
-fmt:
- stage: fmt
+clippy:
+ stage: clippy
image: rustlang/rust:nightly
tags:
- redshift-rs-nightly
before_script:
- export PATH="$HOME/.cargo/bin:$PATH"
- - cargo install --force rustfmt-nightly
+ - cargo install --force clippy --verbose
script:
- - cargo fmt -- --write-mode=diff
- allow_failure: true
\ No newline at end of file
+ - cargo clippy --all -- -D warnings --verbose
+ allow_failure: true
\ No newline at end of file
--
GitLab