From 686c0318605122f732fdd88d751ba902fbb596f1 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 27 May 2026 15:50:37 -0400 Subject: [PATCH] Restore cargo auditable for source builds Hack around bug that fails the build with cargo-auditable. This fix may be fragile, but seems to work. Signed-off-by: Scott Andrews --- Dockerfile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7a7239..f143173 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,19 @@ ARG wasmtime_crate wasmtime_git_rev cargo_auditable_version RUN \ cargo install --locked "cargo-auditable@${cargo_auditable_version}" ; \ if [ "${wasmtime_crate}" = "" ] ; then \ - # restore 'cargo auditable' https://github.com/rust-secure-code/cargo-auditable/issues/257 - cargo install \ - --git https://github.com/bytecodealliance/wasmtime.git \ - --rev "${wasmtime_git_rev}" \ + # work around https://github.com/rust-secure-code/cargo-auditable/issues/124#issuecomment-1693428978 + # cargo install \ + # --git https://github.com/bytecodealliance/wasmtime.git \ + # --rev "${wasmtime_git_rev}" \ + # --locked \ + # wasmtime-cli \ + # ; \ + mkdir wasmtime ; cd wasmtime ; git init ; \ + git fetch --depth 1 https://github.com/bytecodealliance/wasmtime.git ${wasmtime_git_rev} && git reset --hard FETCH_HEAD && git submodule update --init --depth 1; \ + find . -name Cargo.toml | xargs sed -i 's/dep:pulley-interpreter/pulley-interpreter/' ; \ + cargo auditable install \ --locked \ - wasmtime-cli \ + --path . \ ; \ else \ cargo auditable install \