mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use --stage 2 in checktools

Browse Source 
- Remove useless --stage 2 argument to checktools.sh
- Fix help text for expand-yaml-anchors (it had a typo)
This commit is contained in:
Joshua Nelson 2020-07-28 09:36:56 -04:00
parent c4c6453b7b
commit da40cf81e6
5 changed files with 7 additions and 7 deletions
.github/workflows
ci.yml
src
bootstrap
flags.rs
ci
docker/host-x86_64/x86_64-gnu-tools
Dockerfilechecktools.sh
github-actions
ci.yml

2
.github/workflows/ci.yml vendored

@ -414,7 +414,7 @@ jobs:
os: windows-latest-xl
- name: x86_64-msvc-tools
env:
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py --stage 2 /tmp/toolstate/toolstates.json windows
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
os: windows-latest-xl
- name: i686-mingw-1

2
src/bootstrap/flags.rs

@ -425,7 +425,7 @@ Arguments:
This subcommand accepts a number of paths to tools to build and run. For
example:
./x.py run src/tool/expand-yaml-anchors
./x.py run src/tools/expand-yaml-anchors
At least a tool needs to be called.",
);

2
src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

@ -22,4 +22,4 @@ COPY host-x86_64/x86_64-gnu-tools/checktools.sh /tmp/
ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
--save-toolstates=/tmp/toolstate/toolstates.json
ENV SCRIPT /tmp/checktools.sh ../x.py --stage 2
ENV SCRIPT /tmp/checktools.sh ../x.py

6
src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh

@ -7,7 +7,7 @@ X_PY="$1"
# Try to test all the tools and store the build/test success in the TOOLSTATE_FILE
set +e
python3 "$X_PY" test --no-fail-fast \
python3 "$X_PY" test --stage 2 --no-fail-fast \
src/doc/book \
src/doc/nomicon \
src/doc/reference \
@ -22,5 +22,5 @@ set -e
# debugging: print out the saved toolstates
cat /tmp/toolstate/toolstates.json
python3 "$X_PY" test check-tools
python3 "$X_PY" test src/tools/clippy
python3 "$X_PY" test --stage 2 check-tools
python3 "$X_PY" test --stage 2 src/tools/clippy

2
src/ci/github-actions/ci.yml

@ -481,7 +481,7 @@ jobs:
- name: x86_64-msvc-tools
env:
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py --stage 2 /tmp/toolstate/toolstates.json windows
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
<<: *job-windows-xl