Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/ci/docker/host-x86_64/pr-check-2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
mingw-w64 \
&& rm -rf /var/lib/apt/lists/*

RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-linux.tar.gz | \
tar -xz
ENV WASI_SDK_PATH=/wasi-sdk-27.0-x86_64-linux

ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"

COPY scripts/sccache.sh /scripts/
Expand All @@ -30,6 +34,10 @@ ENV SCRIPT \
python3 ../x.py check && \
python3 ../x.py clippy ci --stage 2 && \
python3 ../x.py test --stage 1 core alloc std test proc_macro && \
# Elsewhere, we run all tests for the host. A number of codegen tests are sensitive to the target pointer
# width, for example because they mention a usize. wasm32-wasip1 in test-various, so using it here can't make
# PR CI more strict than full CI.
python3 ../x.py test --stage 1 tests/codegen-llvm --target wasm32-wasip1 && \
Comment on lines +37 to +40
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: IIRC, full CI is a proper superset of PR CI nowadays, so being more strict in PR CI is no longer a major concern.

(But it's still good to know that this is intended to be a subset of checks that run elsewhere in full CI.) 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, unless one writes a separate GHA workflow, citool enforces an invariant that PR CI is subset of Merge CI (modulo some carve-out differences).

python3 ../x.py test --stage 1 src/tools/compiletest && \
python3 ../x.py doc bootstrap --stage 1 && \
# Build both public and internal documentation.
Expand Down
Loading