aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2020-07-10 11:03:47 -0700
committerDaniel Mueller <deso@posteo.net>2020-07-10 11:03:47 -0700
commitbc5bf8236022f69838a8dbf37ea264e8a2b09a25 (patch)
tree15491077b79e303914724a329bbbe2bba04a63f6
parentdf34b6565fdcc6cadedac9c42e6091bc3c6798c0 (diff)
downloadnitrocli-bc5bf8236022f69838a8dbf37ea264e8a2b09a25.tar.gz
nitrocli-bc5bf8236022f69838a8dbf37ea264e8a2b09a25.tar.bz2
Update minimum required Rust version to 1.42.0
This change updates the minimum required version of Rust to 1.42.0. We will need this version in order to make use of the most recent version of nitrokey-test.
-rw-r--r--CHANGELOG.md1
-rw-r--r--README.md2
-rw-r--r--ci/gitlab-ci.yml4
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ced56c6..e9e765b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
Unreleased
----------
- Changed default OTP format from `hex` to `base32`
+- Updated minimum required Rust version to `1.42.0`
0.3.3
diff --git a/README.md b/README.md
index f276d93..cc32f50 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
[![pipeline](https://gitlab.com/d-e-s-o/nitrocli/badges/master/pipeline.svg)](https://gitlab.com/d-e-s-o/nitrocli/commits/master)
[![crates.io](https://img.shields.io/crates/v/nitrocli.svg)](https://crates.io/crates/nitrocli)
-[![rustc](https://img.shields.io/badge/rustc-1.40+-blue.svg)](https://blog.rust-lang.org/2019/12/19/Rust-1.40.0.html)
+[![rustc](https://img.shields.io/badge/rustc-1.42+-blue.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.42.html)
nitrocli
========
diff --git a/ci/gitlab-ci.yml b/ci/gitlab-ci.yml
index 55f0ff6..8536472 100644
--- a/ci/gitlab-ci.yml
+++ b/ci/gitlab-ci.yml
@@ -4,8 +4,8 @@
# Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/rust/tags/
# The recipe for this docker image can be found at:
-# https://github.com/rust-lang/docker-rust/blob/3898d19194231639f1afc3096bd04702eaf555e7/1.40.0/buster/Dockerfile
-image: "rust:1.40.0"
+# https://github.com/rust-lang/docker-rust/blob/8bab191937fcf23569d3a3c31103c1c6f7f2947e/1.42.0/buster/Dockerfile
+image: "rust:1.42.0"
build-test:cargo:
script: