summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2023-04-28 12:32:23 +0200
committerNeal H. Walfield <neal@pep.foundation>2023-05-03 12:37:24 +0200
commit4ec75df65e1e8646ede928dd8475ed0b681cfdae (patch)
tree50f54acb0553576eda0bcf979399113f6207513c /.gitlab-ci.yml
parent4980fd66a7e7db7d7b91f86a7ae1af42b6245478 (diff)
openpgp: Update rust-crypto dependencies
- Note: `x25519-dalek` is broken. It depends on zeroize `=1.3`, but crates like rsa depend on newer versions of zeroize. - See https://github.com/WebAssembly/wasi-crypto/issues/63 , https://github.com/dalek-cryptography/x25519-dalek/issues/92 . - Resolve this by using `x25519-dalek-ng`, which fixes this issue. This is a common workaround, and is also used by, for instance OpenMLS: https://github.com/openmls/openmls/blob/3ff090fd4881cb796d4688f7f174929a7521dbf1/openmls_rust_crypto/README.md?plain=1#L3 - Fixes #910.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8d6fb0d..875e6cab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,12 +61,18 @@ bookworm:
CARGO_TARGET_DIR: /target
CARGO_HOME: /cargo
-bookworm-crypto-rust:
+# XXX: Our MSRV is 1.63 except with rust-crypto, which requires
+# 1.65. Switch back to bookworm, when rustc is >= 1.65.
+#
+# bookworm-crypto-rust:
+# image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
+rust-stable-crypto-rust:
tags:
- linux
stage: build
interruptible: true
- image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
+
+ image: 192.168.122.1:5000/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
dependencies:
- codespell
script: