From 21fde5e01b7db9a8f3847ae351f15ab0582feda2 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Wed, 17 Jul 2019 19:14:03 -0700
Subject: Update nitrokey crate to 0.4.0-alpha.0

This is patch marks the first step in the process of updating the
nitrokey dependency to version 0.4. In particular, it integrates with
the first alpha version.
The main change on the nitrocli side accompanying the version bump is
that the nitrokey::CommandError got replaced by a more general
nitrokey::Error which includes the former variant.

Import subrepo nitrokey/:nitrokey at d433189caefe6bd6c88da7fbb1d6e9304353eb83
---
 nitrokey/.builds/archlinux-use-system-lib.yaml | 11 +++--------
 nitrokey/.builds/archlinux.yml                 | 11 +++--------
 nitrokey/.builds/lint.yml                      | 27 ++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 nitrokey/.builds/lint.yml

(limited to 'nitrokey/.builds')

diff --git a/nitrokey/.builds/archlinux-use-system-lib.yaml b/nitrokey/.builds/archlinux-use-system-lib.yaml
index 6fba33a..ac0fc0f 100644
--- a/nitrokey/.builds/archlinux-use-system-lib.yaml
+++ b/nitrokey/.builds/archlinux-use-system-lib.yaml
@@ -1,3 +1,5 @@
+# Copyright (C) 2019 Robin Krahl <robin.krahl@ireas.org>
+# SPDX-License-Identifier: MIT
 image: archlinux
 packages:
   - rust
@@ -5,7 +7,7 @@ packages:
 environment:
   USE_SYSTEM_LIBNITROKEY: "1"
 sources:
-  - https://git.sr.ht/~ireas/nitrokey-rs
+  - https://git.ireas.org/nitrokey-rs
 tasks:
   - build: |
       cd nitrokey-rs
@@ -13,10 +15,3 @@ tasks:
   - test: |
       cd nitrokey-rs
       cargo test
-  - format: |
-      cd nitrokey-rs
-      cargo fmt -- --check
-triggers:
-  - action: email
-    condition: failure
-    to: nitrokey-rs-dev <nitrokey-rs-dev@ireas.org>
diff --git a/nitrokey/.builds/archlinux.yml b/nitrokey/.builds/archlinux.yml
index 9d45386..dfe2639 100644
--- a/nitrokey/.builds/archlinux.yml
+++ b/nitrokey/.builds/archlinux.yml
@@ -1,10 +1,12 @@
+# Copyright (C) 2019 Robin Krahl <robin.krahl@ireas.org>
+# SPDX-License-Identifier: MIT
 image: archlinux
 packages:
   - rust
   - hidapi
   - gcc
 sources:
-  - https://git.sr.ht/~ireas/nitrokey-rs
+  - https://git.ireas.org/nitrokey-rs
 tasks:
   - build: |
       cd nitrokey-rs
@@ -12,10 +14,3 @@ tasks:
   - test: |
       cd nitrokey-rs
       cargo test
-  - format: |
-      cd nitrokey-rs
-      cargo fmt -- --check
-triggers:
-  - action: email
-    condition: failure
-    to: nitrokey-rs-dev <nitrokey-rs-dev@ireas.org>
diff --git a/nitrokey/.builds/lint.yml b/nitrokey/.builds/lint.yml
new file mode 100644
index 0000000..86a27cd
--- /dev/null
+++ b/nitrokey/.builds/lint.yml
@@ -0,0 +1,27 @@
+# Copyright (C) 2019 Robin Krahl <robin.krahl@ireas.org>
+# SPDX-License-Identifier: MIT
+image: archlinux
+packages:
+  - rustup
+  - python
+  - python-pip
+  - python-pygit2
+sources:
+  - https://git.ireas.org/nitrokey-rs
+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