From 2feb399b49b49c257d896999f09bf132ca2359c9 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Sat, 21 Aug 2021 17:12:57 +0200
Subject: [PATCH] ci: simplify
---
.gitlab-ci.yml | 35 +++++++----------------------------
1 file changed, 7 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa03e1a3d..be03c6d6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,7 @@
stages:
- - style
- - tests
- quality
- - build
+ - tests
+ #- build
workflow:
rules:
@@ -19,16 +18,19 @@ workflow:
tags:
- elois-tauon
-rustfmt:
+fmt_and_clippy:
extends: .env
- stage: style
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_MERGE_REQUEST_ID
+ - when: on_success
+ stage: quality
script:
- cargo fmt -- --version
- cargo fmt -- --check
+ - cargo clippy -- -V
+ - cargo clippy --all --tests -- -D warnings
tests:
extends: .env
@@ -42,26 +44,3 @@ tests:
stage: tests
script:
- cargo test
-
-clippy:
- extends: .env
- rules:
- - if: $CI_COMMIT_TAG
- when: never
- - if: $CI_MERGE_REQUEST_ID
- - when: on_success
- stage: quality
- script:
- - cargo clippy -- -V
- - cargo clippy --all --tests -- -D warnings
-
-build:
- extends: .env
- rules:
- - if: $CI_COMMIT_REF_NAME =~ /^wip*$/
- when: manual
- - if: '$CI_COMMIT_TAG || $CI_MERGE_REQUEST_ID ||$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH =~ /^release/'
- - when: manual
- stage: build
- script:
- - cargo build --release
--
GitLab