Skip to content

Commit 6096f82

Browse files
Change toolstate to no longer fail on nightly
Previously, toolstate would always error the build if the tool regressed (or didn't improve to test-pass). This isn't great for rollups, in particular, as it means we basically can't viably rollup tool updates. In most cases, when trying to land a submodule (tool) change, you mostly want to just bump the sub-commit, and don't care too much if that actually fully fixes the tool.
1 parent f2023ac commit 6096f82

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

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

+6-12
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ verify_submodule_changed() {
5656
echo "If you do NOT intend to update '$1', please ensure you did not accidentally"
5757
echo "change the submodule at '$2'. You may ask your reviewer for the"
5858
echo "proper steps."
59-
exit 3
59+
# exit if we're in beta week, otherwise we don't want to,
60+
# it's fine to land changes/regressions to toolstate
61+
if [ $SIX_WEEK_CYCLE -ge 35 ]; then
62+
exit 3
63+
fi
6064
fi
6165
fi
6266
}
@@ -105,21 +109,11 @@ status_check() {
105109

106110
status_check "submodule_changed"
107111

108-
CHECK_NOT="$(readlink -f "$(dirname $0)/checkregression.py")"
109112
# This callback is called by `commit_toolstate_change`, see `repo.sh`.
110113
change_toolstate() {
111-
# only update the history
112-
if python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" changed; then
113-
echo 'Toolstate is not changed. Not updating.'
114-
else
115-
if [ $SIX_WEEK_CYCLE -ge 35 ]; then
116-
# Reject any regressions during the week before beta cutoff.
117-
python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" regressed
118-
fi
119-
sed -i "1 a\\
114+
sed -i "1 a\\
120115
$COMMIT\t$(cat "$TOOLSTATE_FILE")
121116
" "history/$OS.tsv"
122-
fi
123117
}
124118

125119
if [ "$RUST_RELEASE_CHANNEL" = nightly ]; then

0 commit comments

Comments
 (0)