Skip to content

fix(scripts): version-switch.sh says whether the start warned of plugins.toml #3255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gold-silver-copper merged 1 commit into from
Nov 11, 2026
Merged

fix(scripts): version-switch.sh says whether the start warned of plugins.toml #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/version-switch-expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Checks of scripts/version-switch.sh known to fail between v0.46.0 and main.
# Pass this file with --expected on the release PR; delete a line when its
# check passes (the run reports it as XPASS and fails until then).
settings-upgrade # main ignores v0.46.0's plugins.toml: a plugin turned off comes back on, silently
settings-upgrade # main ignores v0.46.0's plugins.toml (its start warns so): a plugin turned off comes back on
settings-downgrade # v0.46.0 ignores main's settings.toml [plugins] and writes a fresh plugins.toml
7 changes: 5 additions & 2 deletions scripts/version-switch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ none_compiled() { [[ -z "$1" || "$1" == "0 crates"* ]]; }
# untouched SUMMARY: true when it compiled nothing and changed no locked version.
untouched() { [[ -z "$1" || "$1" == "0 crates compiled, 0 locked versions changed" ]]; }

built="" again="" turn_rc=0
built="" again="" turn_rc=0 turn_name=""
# prebuild LABEL NAME: `rig build` with launcher LABEL, under --lock when
# given; records its time, what it compiled (in $built) and the disk
# RIG_HOME/target uses.
Expand All @@ -246,7 +246,7 @@ turn() {
touch "$logs/.stamp"
sleep 1
rig "$@"
turn_rc=$rc
turn_rc=$rc turn_name=$name
again=$(build_since "$name.turn")
none_compiled "$again" || switches+=("$(printf '%-16s %-4s turn compiled again: %s' "$name" "$label" "$again")")
echo " $name: exit $rc, turn ${wall}s"
Expand All @@ -255,6 +255,7 @@ turn() {
# plugin_off LABEL NAME PLUGIN ID: checks that launcher LABEL lists PLUGIN off,
# or refuses the settings with a message naming them; a refusal counts only
# when the turn before it failed too, so no start ran without the setting.
# A plugin on again says whether that turn warned of plugins.toml.
plugin_off() {
local label="$1" name="$2" plugin="$3" id="$4"
rig "$label" "$name" plugin list
Expand All @@ -264,6 +265,8 @@ plugin_off() {
check "$id" "$clear" "refused (exit $rc, the turn before exit $turn_rc): $(first_error "$name")"
elif grep -E -q "^off +$plugin\b" "$logs/$name.out"; then
check "$id" 0 "$plugin is still off"
elif grep -q -F plugins.toml "$logs/$turn_name.err"; then
check "$id" 1 "$plugin is on again; the turn before warned of plugins.toml"
else
check "$id" 1 "$plugin is on again, silently"
fi
Expand Down
Loading