File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
ci/docker/host-x86_64/test-various Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -1389,6 +1389,13 @@ impl Build {
13891389 if let Some ( path) = finder. maybe_have ( "wasmtime" ) {
13901390 if let Ok ( mut path) = path. into_os_string ( ) . into_string ( ) {
13911391 path. push_str ( " run -C cache=n --dir ." ) ;
1392+ // Make sure that tests have access to RUSTC_BOOTSTRAP. This (for example) is
1393+ // required for libtest to work on beta/stable channels.
1394+ //
1395+ // NB: with Wasmtime 20 this can change to `-S inherit-env` to
1396+ // inherit the entire environment rather than just this single
1397+ // environment variable.
1398+ path. push_str ( " --env RUSTC_BOOTSTRAP" ) ;
13921399 return Some ( path) ;
13931400 }
13941401 }
Original file line number Diff line number Diff line change @@ -55,9 +55,9 @@ ENV RUST_CONFIGURE_ARGS \
5555ENV NO_DEBUG_ASSERTIONS=1
5656ENV NO_OVERFLOW_CHECKS=1
5757
58- RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v18 .0.2 /wasmtime-v18 .0.2 -x86_64-linux.tar.xz | \
58+ RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v19 .0.0 /wasmtime-v19 .0.0 -x86_64-linux.tar.xz | \
5959 tar -xJ
60- ENV PATH "$PATH:/wasmtime-v18 .0.2 -x86_64-linux"
60+ ENV PATH "$PATH:/wasmtime-v19 .0.0 -x86_64-linux"
6161
6262ENV WASM_TARGETS=wasm32-wasip1
6363ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_TARGETS \
You can’t perform that action at this time.
0 commit comments