nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-19 10:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

add a few comments for the toolstate stuff

Browse Source
This commit is contained in:
Ralf Jung 2019-07-18 10:47:38 +02:00 committed by Who? Me?!
parent 8070bb828c
commit b2d05dba41
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ci/docker/x86_64-gnu-tools/checktools.sh
View File

@ -42,7 +42,7 @@ check_tool_failed() {
} }
# This function checks that if a tool's submodule changed, the tool's state must improve # This function checks that if a tool's submodule changed, the tool's state must improve
verify_status() { verify_submodule_changed() {
echo "Verifying status of $1..." echo "Verifying status of $1..."
if echo "$CHANGED_FILES" | grep -q "^M[[:blank:]]$2$"; then if echo "$CHANGED_FILES" | grep -q "^M[[:blank:]]$2$"; then
echo "This PR updated '$2', verifying if status is 'test-pass'..." echo "This PR updated '$2', verifying if status is 'test-pass'..."
@ -67,7 +67,7 @@ verify_status() {
check_dispatch() { check_dispatch() {
if [ "$1" = submodule_changed ]; then if [ "$1" = submodule_changed ]; then
# ignore $2 (branch id) # ignore $2 (branch id)
verify_status $3 $4 verify_submodule_changed $3 $4
elif [ "$2" = beta ]; then elif [ "$2" = beta ]; then
echo "Requiring test passing for $3..." echo "Requiring test passing for $3..."
if check_tool_failed "$3"; then if check_tool_failed "$3"; then
@ -76,7 +76,9 @@ check_dispatch() {
fi fi
} }
# list all tools here # List all tools here.
# This function gets called with "submodule_changed" for each PR that changed a submodule,
# and with "beta_required" for each PR that lands on beta/stable.
status_check() { status_check() {
check_dispatch $1 beta book src/doc/book check_dispatch $1 beta book src/doc/book
check_dispatch $1 beta nomicon src/doc/nomicon check_dispatch $1 beta nomicon src/doc/nomicon
@ -86,7 +88,8 @@ status_check() {
check_dispatch $1 beta rls src/tools/rls check_dispatch $1 beta rls src/tools/rls
check_dispatch $1 beta rustfmt src/tools/rustfmt check_dispatch $1 beta rustfmt src/tools/rustfmt
check_dispatch $1 beta clippy-driver src/tools/clippy check_dispatch $1 beta clippy-driver src/tools/clippy
# these tools are not required for beta to successfully branch # These tools are not required on the beta/stable branches.
# They will still cause failure during the beta cutoff week, see `src/tools/publish_toolstate.py` for that.
check_dispatch $1 nightly miri src/tools/miri check_dispatch $1 nightly miri src/tools/miri
check_dispatch $1 nightly embedded-book src/doc/embedded-book check_dispatch $1 nightly embedded-book src/doc/embedded-book
} }
@ -97,6 +100,7 @@ status_check() {
status_check "submodule_changed" status_check "submodule_changed"
CHECK_NOT="$(readlink -f "$(dirname $0)/checkregression.py")" CHECK_NOT="$(readlink -f "$(dirname $0)/checkregression.py")"
# This callback is called by `commit_toolstate_change`, see `repo.sh`.
change_toolstate() { change_toolstate() {
# only update the history # only update the history
if python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" changed; then if python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" changed; then

4
src/ci/docker/x86_64-gnu-tools/repo.sh
View File

@ -62,6 +62,10 @@ commit_toolstate_change() {
MESSAGE_FILE="$1" MESSAGE_FILE="$1"
shift shift
for RETRY_COUNT in 1 2 3 4 5; do for RETRY_COUNT in 1 2 3 4 5; do
# Call the callback; this will in the end call `change_toolstate` from
# `checktools.sh` if we are in the `auto` branch (pre-landing) or
# `src/tools/publish_toolstate.py` if we are in the `master` branch
# (post-landing).
"$@" "$@"
# `git commit` failing means nothing to commit. # `git commit` failing means nothing to commit.
FAILURE=0 FAILURE=0