aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2019-12-27 23:03:50 +0100
committerRobin Krahl <robin.krahl@ireas.org>2019-12-27 23:03:50 +0100
commit56cc12c779744fb88bb115b55cd80fd2270589c9 (patch)
tree9dc2792ec20bfca388e7587bd45b1489c28cf56e
parent977151d2e56e63ab15e47155457761d7b76b69fc (diff)
downloadnitrokey-rs-56cc12c779744fb88bb115b55cd80fd2270589c9.tar.gz
nitrokey-rs-56cc12c779744fb88bb115b55cd80fd2270589c9.tar.bz2
Move format and clippy checks to archlinux-*.yml
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.
-rw-r--r--.builds/archlinux-use-system-lib.yml8
-rw-r--r--.builds/lint.yml12
2 files changed, 8 insertions, 12 deletions
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