Skip to content

Commit bddbd7d

Browse files
committed
ci: Add /cargo/bin to the path in Docker
This makes it possible to use nextest within the container.
1 parent f878724 commit bddbd7d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ci/run-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ run() {
5050
-v "$(pwd)/target:/builtins-target"
5151
-v "$(rustc --print sysroot):/rust:ro"
5252
)
53-
run_cmd="$run_cmd PATH=\$PATH:/rust/bin"
53+
run_cmd="$run_cmd PATH=\$PATH:/rust/bin:/cargo/bin"
5454
else
5555
# Use rustc provided by a docker image
5656
docker volume create compiler-builtins-cache

ci/run.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ esac
229229
# Make sure a simple build works
230230
cargo check -p libm --no-default-features --target "$target"
231231

232-
233232
if [ "${BUILD_ONLY:-}" = "1" ]; then
234233
# If we are on targets that can't run tests, verify that we can build.
235234
cmd=(cargo build --target "$target" --package libm)
@@ -255,6 +254,9 @@ else
255254
cmd+=(--config-file "$cfg_file")
256255
fi
257256

257+
# Not all configurations have tests to run on wasm
258+
[[ "$target" = *"wasm"* ]] && cmd+=(--no-tests=warn)
259+
258260
cmd+=("${mflags[@]}")
259261
profile_flag="--cargo-profile"
260262
fi

0 commit comments

Comments
 (0)