Skip to content

Commit 96da158

Browse files
authored
Unrolled build for #148958
Rollup merge of #148958 - saethlin:32bit-codegen-pr, r=kobzol Run codegen tests on a 32-bit target in PR CI wasm32-wasip1 is the wasm target used in test-various. So using it somewhere else seems like a good bet.
2 parents 89fe961 + 64f0579 commit 96da158

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/ci/docker/host-x86_64/pr-check-2/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
mingw-w64 \
2222
&& rm -rf /var/lib/apt/lists/*
2323

24+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-linux.tar.gz | \
25+
tar -xz
26+
ENV WASI_SDK_PATH=/wasi-sdk-27.0-x86_64-linux
27+
2428
ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"
2529

2630
COPY scripts/sccache.sh /scripts/
@@ -30,6 +34,10 @@ ENV SCRIPT \
3034
python3 ../x.py check && \
3135
python3 ../x.py clippy ci --stage 2 && \
3236
python3 ../x.py test --stage 1 core alloc std test proc_macro && \
37+
# Elsewhere, we run all tests for the host. A number of codegen tests are sensitive to the target pointer
38+
# width, for example because they mention a usize. wasm32-wasip1 in test-various, so using it here can't make
39+
# PR CI more strict than full CI.
40+
python3 ../x.py test --stage 1 tests/codegen-llvm --target wasm32-wasip1 && \
3341
python3 ../x.py test --stage 1 src/tools/compiletest && \
3442
python3 ../x.py doc bootstrap --stage 1 && \
3543
# Build both public and internal documentation.

0 commit comments

Comments
 (0)