Move CI to new builtin check-toolstate

Author: Mark-Simulacrum

src/bootstrap/toolstate.rs

@@ -290,6 +290,8 @@ fn commit_toolstate_change(
         }
     }
 
+    // If changing anything here, then please check that src/ci/publish_toolstate.sh is up to date
+    // as well.
     git_config("user.email", "[email protected]");
     git_config("user.name", "Rust Toolstate Update");
     git_config("credential.helper", "store");

src/ci/azure-pipelines/auto.yml

@@ -163,7 +163,7 @@ jobs:
         NO_LLVM_ASSERTIONS: 1
       # MSVC tools tests
       x86_64-msvc-tools:
-        SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
+        SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py
         RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
 
       # 32/64-bit MinGW builds.

src/ci/azure-pipelines/master.yml

@@ -16,10 +16,7 @@ steps:
 - checkout: self
   fetchDepth: 2
 
-- script: |
-    export MESSAGE_FILE=$(mktemp -t msg.XXXXXX)
-    . src/ci/docker/x86_64-gnu-tools/repo.sh
-    commit_toolstate_change "$MESSAGE_FILE" "$BUILD_SOURCESDIRECTORY/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE" "$TOOLSTATE_REPO_ACCESS_TOKEN"
+- script: src/ci/publish_toolstate.sh
   displayName: Publish toolstate
   env:
     TOOLSTATE_REPO_ACCESS_TOKEN: $(TOOLSTATE_REPO_ACCESS_TOKEN)

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

@@ -17,14 +17,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-COPY x86_64-gnu-tools/checkregression.py /tmp/
 COPY x86_64-gnu-tools/checktools.sh /tmp/
-COPY x86_64-gnu-tools/repo.sh /tmp/
 
 # Run rustbook with `linkcheck` feature enabled
 ENV CHECK_LINKS 1
 
 ENV RUST_CONFIGURE_ARGS \
   --build=x86_64-unknown-linux-gnu \
   --save-toolstates=/tmp/toolstate/toolstates.json
-ENV SCRIPT /tmp/checktools.sh ../x.py /tmp/toolstate/toolstates.json linux
+ENV SCRIPT /tmp/checktools.sh ../x.py

src/ci/docker/x86_64-gnu-tools/checkregression.py

@@ -3,18 +3,6 @@
 set -eu
 
 X_PY="$1"
-TOOLSTATE_FILE="$(realpath -m $2)"
-OS="$3"
-COMMIT="$(git rev-parse HEAD)"
-CHANGED_FILES="$(git diff --name-status HEAD HEAD^)"
-SIX_WEEK_CYCLE="$(( ($(date +%s) / 86400 - 20) % 42 ))"
-# ^ Number of days after the last promotion of beta.
-#   Its value is 41 on the Tuesday where "Promote master to beta (T-2)" happens.
-#   The Wednesday after this has value 0.
-#   We track this value to prevent regressing tools in the last week of the 6-week cycle.
-
-mkdir -p "$(dirname $TOOLSTATE_FILE)"
-touch "$TOOLSTATE_FILE"
 
 # Try to test all the tools and store the build/test success in the TOOLSTATE_FILE
 
@@ -34,106 +22,4 @@ python2.7 "$X_PY" test --no-fail-fast \
 
 set -e
 
-cat "$TOOLSTATE_FILE"
-echo
-
-# This function checks if a particular tool is *not* in status "test-pass".
-check_tool_failed() {
-    grep -vq '"'"$1"'":"test-pass"' "$TOOLSTATE_FILE"
-}
-
-# This function checks that if a tool's submodule changed, the tool's state must improve
-verify_submodule_changed() {
-    echo "Verifying status of $1..."
-    if echo "$CHANGED_FILES" | grep -q "^M[[:blank:]]$2$"; then
-        echo "This PR updated '$2', verifying if status is 'test-pass'..."
-        if check_tool_failed "$1"; then
-            echo
-            echo "⚠️ We detected that this PR updated '$1', but its tests failed."
-            echo
-            echo "If you do intend to update '$1', please check the error messages above and"
-            echo "commit another update."
-            echo
-            echo "If you do NOT intend to update '$1', please ensure you did not accidentally"
-            echo "change the submodule at '$2'. You may ask your reviewer for the"
-            echo "proper steps."
-            exit 3
-        fi
-    fi
-}
-
-# deduplicates the submodule check and the assertion that on beta some tools MUST be passing.
-# $1 should be "submodule_changed" to only check tools that got changed by this PR,
-# or "beta_required" to check all tools that have $2 set to "beta".
-check_dispatch() {
-    if [ "$1" = submodule_changed ]; then
-        # ignore $2 (branch id)
-        verify_submodule_changed $3 $4
-    elif [ "$2" = beta ]; then
-        echo "Requiring test passing for $3..."
-        if check_tool_failed "$3"; then
-            exit 4
-        fi
-    fi
-}
-
-# 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.
-# The purpose of this function is to *reject* PRs if a tool is not "test-pass" and
-# (a) the tool's submodule has been updated, or (b) we landed on beta/stable and the
-# tool has to "test-pass" on that branch.
-status_check() {
-    check_dispatch $1 beta book src/doc/book
-    check_dispatch $1 beta nomicon src/doc/nomicon
-    check_dispatch $1 beta reference src/doc/reference
-    check_dispatch $1 beta rust-by-example src/doc/rust-by-example
-    check_dispatch $1 beta edition-guide src/doc/edition-guide
-    check_dispatch $1 beta rls src/tools/rls
-    check_dispatch $1 beta rustfmt src/tools/rustfmt
-    check_dispatch $1 beta clippy-driver src/tools/clippy
-    # These tools are not required on the beta/stable branches, but they *do* cause
-    # PRs to fail if a submodule update does not fix them.
-    # They will still cause failure during the beta cutoff week, unless `checkregression.py`
-    # exempts them from that.
-    check_dispatch $1 nightly miri src/tools/miri
-    check_dispatch $1 nightly embedded-book src/doc/embedded-book
-    check_dispatch $1 nightly rustc-guide src/doc/rustc-guide
-}
-
-# If this PR is intended to update one of these tools, do not let the build pass
-# when they do not test-pass.
-
-status_check "submodule_changed"
-
-CHECK_NOT="$(readlink -f "$(dirname $0)/checkregression.py")"
-# This callback is called by `commit_toolstate_change`, see `repo.sh`.
-change_toolstate() {
-    # only update the history
-    if python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" changed; then
-        echo 'Toolstate is not changed. Not updating.'
-    else
-        if [ $SIX_WEEK_CYCLE -ge 35 ]; then
-            # Reject any regressions during the week before beta cutoff.
-            python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" regressed
-        fi
-        sed -i "1 a\\
-$COMMIT\t$(cat "$TOOLSTATE_FILE")
-" "history/$OS.tsv"
-    fi
-}
-
-if [ "$RUST_RELEASE_CHANNEL" = nightly ]; then
-    if [ -n "${TOOLSTATE_PUBLISH+is_set}" ]; then
-        . "$(dirname $0)/repo.sh"
-        MESSAGE_FILE=$(mktemp -t msg.XXXXXX)
-        echo "($OS CI update)" > "$MESSAGE_FILE"
-        commit_toolstate_change "$MESSAGE_FILE" change_toolstate
-        rm -f "$MESSAGE_FILE"
-    fi
-    exit 0
-fi
-
-# abort compilation if an important tool doesn't build
-# (this code is reachable if not on the nightly channel)
-status_check "beta_required"
+python2.7 "$X_PY" test check-tools

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

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -eu
+
+# The following lines are also found in src/bootstrap/toolstate.rs,
+# so if updating here, please also update that file.
+
+export MESSAGE_FILE=$(mktemp -t msg.XXXXXX)
+
+git config --global user.email '[email protected]'
+git config --global user.name 'Rust Toolstate Update'
+git config --global credential.helper store
+printf 'https://%s:[email protected]\n' "$TOOLSTATE_REPO_ACCESS_TOKEN" \
+    > "$HOME/.git-credentials"
+git clone --depth=1 $TOOLSTATE_REPO
+
+cd rust-toolstate
+FAILURE=1
+for RETRY_COUNT in 1 2 3 4 5; do
+    #  The purpose is to publish the new "current" toolstate in the toolstate repo.
+    "$BUILD_SOURCESDIRECTORY/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" \
+        "$(git log --format=%s -n1 HEAD)" \
+        "$MESSAGE_FILE" \
+        "$TOOLSTATE_REPO_ACCESS_TOKEN"
+    # `git commit` failing means nothing to commit.
+    FAILURE=0
+    git commit -a -F "$MESSAGE_FILE" || break
+    # On failure randomly sleep for 0 to 3 seconds as a crude way to introduce jittering.
+    git push origin master && break || sleep $(LC_ALL=C tr -cd 0-3 < /dev/urandom | head -c 1)
+    FAILURE=1
+    git fetch origin master
+    git reset --hard origin/master
+done