From 56cc12c779744fb88bb115b55cd80fd2270589c9 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Fri, 27 Dec 2019 23:03:50 +0100
Subject: Move format and clippy checks to archlinux-*.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Rust package for Arch includes rustfmt and clippy, so we don’t have
to use rustup for it.  To make the builds simpler and faster, we move
the format and clippy tasks to the archlinux-*.yml build that already
has Rust installed.
---
 .builds/archlinux-use-system-lib.yml |  8 ++++++++
 .builds/lint.yml                     | 12 ------------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to '.builds')

diff --git a/.builds/archlinux-use-system-lib.yml b/.builds/archlinux-use-system-lib.yml
index 2539e98..29bda19 100644
--- a/.builds/archlinux-use-system-lib.yml
+++ b/.builds/archlinux-use-system-lib.yml
@@ -9,9 +9,17 @@ environment:
 sources:
   - https://git.ireas.org/nitrokey-rs
 tasks:
+  - version: |
+      rustc -V
   - build: |
       cd nitrokey-rs
       cargo build --release
   - test: |
       cd nitrokey-rs
       cargo test
+  - format: |
+      cd nitrokey-rs
+      cargo fmt -- --check
+  - clippy: |
+      cd nitrokey-rs
+      cargo clippy -- -D warnings
diff --git a/.builds/lint.yml b/.builds/lint.yml
index 1299af4..e055071 100644
--- a/.builds/lint.yml
+++ b/.builds/lint.yml
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 image: archlinux
 packages:
-  - rustup
   - python
   - python-pip
   - python-pygit2
@@ -11,17 +10,6 @@ sources:
 tasks:
   - setup: |
       pip install --user fsfe-reuse
-      rustup update stable
-      rustup self upgrade-data
-      rustup default stable
-      rustup component add rustfmt
-      rustup component add clippy
-  - format: |
-      cd nitrokey-rs
-      cargo fmt -- --check
   - reuse: |
       cd nitrokey-rs
       ~/.local/bin/reuse lint
-  - clippy: |
-      cd nitrokey-rs
-      cargo clippy -- -D warnings
-- 
cgit v1.2.1