From ff4d51ad5b1732d508e955c565fbd2e2baad2ff9 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Mon, 16 Dec 2019 19:12:56 +0000 Subject: Update the nitrokey-sys version specification to ~3.4 Previously, we required nitrokey-sys version 3.4, which allows the upgrade to nitrokey-sys 3.5. Unfortunately, libnitrokey version 3.5, which is packaged as nitrokey-sys 3.5, introduced breaking changes, breaking the semantic versioning guarantees and causing compilation errors if this version is selected. This patch changes the version specification from 3.4 to ~3.4, i. e. >= 3.4.0, < 3.5.0, to make sure that nitrokey-rs can be compiled without errors. --- CHANGELOG.md | 3 +++ Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edc33f6..61cdf13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Unreleased +- Update the nitrokey-sys dependency version specification to ~3.4. + # v0.3.4 (2019-01-20) - Fix authentication methods that assumed that `char` is signed. diff --git a/Cargo.toml b/Cargo.toml index 838ab45..2db9326 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ test-storage = [] [dependencies] libc = "0.2" -nitrokey-sys = "3.4" +nitrokey-sys = "~3.4" rand_core = {version = "0.3", default-features = false} rand_os = {version = "0.1"} -- cgit v1.2.1 From 6e9823f95b4aec2b82b285697f73cc720bc7906a Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Mon, 16 Dec 2019 20:40:07 +0100 Subject: Fix triggers and source URL in CI scripts Due to a change in the CI infrastructure, we have to change the source URL for the CI scripts in .builds. Also, we can remove the triggers as they are automatically inferred by the build submit script. --- .builds/archlinux-use-system-lib.yaml | 6 +----- .builds/archlinux.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.builds/archlinux-use-system-lib.yaml b/.builds/archlinux-use-system-lib.yaml index 6fba33a..01705c1 100644 --- a/.builds/archlinux-use-system-lib.yaml +++ b/.builds/archlinux-use-system-lib.yaml @@ -5,7 +5,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 @@ -16,7 +16,3 @@ tasks: - format: | cd nitrokey-rs cargo fmt -- --check -triggers: - - action: email - condition: failure - to: nitrokey-rs-dev diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 9d45386..543e93c 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -4,7 +4,7 @@ packages: - hidapi - gcc sources: - - https://git.sr.ht/~ireas/nitrokey-rs + - https://git.ireas.org/nitrokey-rs tasks: - build: | cd nitrokey-rs @@ -15,7 +15,3 @@ tasks: - format: | cd nitrokey-rs cargo fmt -- --check -triggers: - - action: email - condition: failure - to: nitrokey-rs-dev -- cgit v1.2.1 From f2cc7fdf081340b0b812f0b212537ba2b55d382e Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Mon, 16 Dec 2019 20:45:38 +0100 Subject: Release v0.3.5 --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61cdf13..04da117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Unreleased +# v0.3.5 (2019-12-16) - Update the nitrokey-sys dependency version specification to ~3.4. # v0.3.4 (2019-01-20) diff --git a/Cargo.toml b/Cargo.toml index 2db9326..238cc02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nitrokey" -version = "0.3.4" +version = "0.3.5" authors = ["Robin Krahl "] edition = "2018" homepage = "https://code.ireas.org/nitrokey-rs/" -- cgit v1.2.1