mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-27 01:04:03 +00:00
Rollup merge of #86623 - GuillaumeGomez:prevent-explanation-removal, r=Mark-Simulacrum
Add check to ensure error code explanations are not removed anymore even if not emitted The error explanations are useful in case you use older version of the compiler. Even more if they had an explanation. If they are not emitted, their explanations should be updated but not removed (as we did for a few of them, like E0001). r? `@Mark-Simulacrum`
This commit is contained in:
commit
ac880e5e39
@ -28,6 +28,7 @@ COPY scripts/sccache.sh /scripts/
|
||||
RUN sh /scripts/sccache.sh
|
||||
|
||||
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
|
||||
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
|
||||
|
||||
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
|
||||
ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
|
||||
@ -37,6 +38,7 @@ ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
|
||||
python3 ../x.py test --stage 2 src/tools/tidy && \
|
||||
python3 ../x.py doc --stage 0 library/test && \
|
||||
/scripts/validate-toolstate.sh && \
|
||||
/scripts/validate-error-codes.sh && \
|
||||
# Runs checks to ensure that there are no ES5 issues in our JS code.
|
||||
es-check es5 ../src/librustdoc/html/static/*.js && \
|
||||
eslint ../src/librustdoc/html/static/*.js
|
||||
|
20
src/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh
Executable file
20
src/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
# Checks that no error code explanation is removed.
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
if [[ -z "$BASE_COMMIT" ]]; then
|
||||
echo "not checking error code explanations removal"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Check if an error code explanation was removed..."
|
||||
|
||||
if (git diff "$BASE_COMMIT" --name-status | grep '^D' \
|
||||
| grep --quiet "compiler/rustc_error_codes/src/error_codes/"); then
|
||||
echo "Error code explanations should never be removed!"
|
||||
echo "Take a look at E0001 to see how to handle it."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "No error code explanation was removed!"
|
@ -219,6 +219,14 @@ else
|
||||
command="/checkout/src/ci/run.sh"
|
||||
fi
|
||||
|
||||
if [ "$CI" != "" ]; then
|
||||
# Get some needed information for $BASE_COMMIT
|
||||
git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF"
|
||||
BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)"
|
||||
else
|
||||
BASE_COMMIT=""
|
||||
fi
|
||||
|
||||
docker \
|
||||
run \
|
||||
--workdir /checkout/obj \
|
||||
@ -237,6 +245,7 @@ docker \
|
||||
--env TOOLSTATE_PUBLISH \
|
||||
--env RUST_CI_OVERRIDE_RELEASE_CHANNEL \
|
||||
--env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
|
||||
--env BASE_COMMIT="$BASE_COMMIT" \
|
||||
--init \
|
||||
--rm \
|
||||
rust-ci \
|
||||
|
Loading…
Reference in New Issue
Block a user