summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2022-03-08 07:30:47 +0200
committerLars Wirzenius <liw@liw.fi>2022-03-08 07:30:47 +0200
commitb761fb3d4bdc8c550474907c58f9ddea06ba02a3 (patch)
tree8a069691a4f82d54aeb02a10f9cb0f60453e3130
parentc9147ab7562ac23acb6ea4bdaee3d493136ec638 (diff)
downloadliw-ci-b761fb3d4bdc8c550474907c58f9ddea06ba02a3.tar.gz
hack to use rustup cargo
Sponsored-by: author
-rw-r--r--ci-prod.ick10
1 files changed, 10 insertions, 0 deletions
diff --git a/ci-prod.ick b/ci-prod.ick
index 5c150c5..1492f7c 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -1199,6 +1199,11 @@ pipelines:
type --all cargo
(cd src && cargo read-manifest)
+ # Force use of rustup cargo instead of cargo as packaged by
+ # Debian. dh-cargo hardcodes /usr/bin/cargo.
+ mv /usr/bin/cargo /usr/bin/cargo.debian
+ ln -nsf /workspace/.cargo/bin/cargo /usr/bin/cargo
+
rm -f ./*_*.*
cd /workspace/src
git clean -fdx -e target
@@ -1236,6 +1241,11 @@ pipelines:
exit 1
fi
+ # Undo previous hack.
+ rm /usr/bin/cargo
+ mv /usr/bin/cargo.debian /usr/bin/cargo
+
+
- pipeline: rust_run_check_if_there
actions:
- where: container