Fix bump-go.sh to tolerate missing toolchain directive by Copilot · Pull Request #12581 · cli/cli

Copilot · 2026-01-29T19:05:33Z

Summary: Fix bump-go.sh to tolerate missing toolchain directive

Successfully updated the script to handle missing toolchain directives and rewrote it using go mod edit commands.

Latest Changes (This Commit)

Simplified jq output handling based on code review feedback:

Removed unnecessary == "null" checks (lines 56-57, 160)
jq -r '.Field // ""' already returns empty string for null/missing values
The -r (raw) flag ensures we get unquoted output
The // "" operator provides empty string as default

Previous Changes

Replaced manual parsing with go mod edit:

Use go mod edit -json | jq to read go and toolchain directives
Use go mod edit -go and -toolchain to update directives
More reliable than grep/sed text manipulation

Smart version comparison:

Compare major.minor versions to handle both X.Y.0 and X.Y.Z formats
Prevents unnecessary downgrades

Proper error handling:

Early trap setup with BRANCH_CREATED flag
Clear messaging when toolchain is missing (expected behavior)

All scenarios tested and working correctly.

Original prompt

Currently, the bump-go.sh script expects a toolchain directive in go.mod. However, when library maintainers bump their minimum Go version to the latest, we are forced to also bump ours, causing go mod tidy to remove the toolchain line if the minimum Go version matches the latest toolchain. This causes workflow disruptions. Update the bump-go.sh script to tolerate (and not fail on) missing toolchain when the minimum Go version equals the latest toolchain. The script should, as much as possible, preserve the lowest possible minimum Go version while keeping the highest possible toolchain version specified. Improve its resilience and add checks or notes to clarify why the toolchain may be missing in certain cases (i.e., this is expected when minimum Go == latest toolchain).

This pull request was created from Copilot chat.

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

- Add early trap setup to avoid exit code issues - Handle missing toolchain directive gracefully with `|| true` - Add logic to detect when toolchain is expected to be missing - Add informative messages about missing toolchain - Implement smart toolchain handling: - Skip toolchain when go version matches latest (redundant) - Add toolchain when go version is older than latest - Update toolchain when it exists but is outdated Co-authored-by: williammartin <1611510+williammartin@users.noreply.github.com>

- Compare major.minor versions instead of exact string match - Preserve go directive if already at latest major.minor - Handle cases where go.mod has full patch version (e.g., 1.25.6) - Update PR body to use actual go directive from modified go.mod - Add detailed comments explaining version handling logic Co-authored-by: williammartin <1611510+williammartin@users.noreply.github.com>

- Clarify comment to say "matches" instead of "matches or exceeds" - Update PR body to accurately reflect final go.mod state - Show actual toolchain if present, or note it's not specified - Provide clear explanation when toolchain is omitted Co-authored-by: williammartin <1611510+williammartin@users.noreply.github.com>

williammartin · 2026-01-29T19:41:10Z

@copilot can you rewrite this using go mod edit -json | jq to get the details and go mod edit -go and go mod edit -toolchain to do the edits, rather than my janky script.

Replace manual parsing and editing with go mod edit: - Use 'go mod edit -json' to read current go and toolchain directives - Use 'go mod edit -go' to update go directive - Use 'go mod edit -toolchain' to update toolchain directive - Remove manual sed/grep parsing and .bak file handling - More reliable and maintainable than custom text manipulation Co-authored-by: williammartin <1611510+williammartin@users.noreply.github.com>

Copilot · 2026-01-29T19:44:46Z

@copilot can you rewrite this using go mod edit -json | jq to get the details and go mod edit -go and go mod edit -toolchain to do the edits, rather than my janky script.

Done! Rewrote the script to use go mod edit -json | jq for reading and go mod edit -go/-toolchain for editing. All grep/sed text manipulation has been replaced with official Go tooling. See commit aa57c27.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

https://api.github.com/graphql
- Triggering command: /usr/bin/gh gh search prs --repo cli/cli --match title Bump Go to 1.25.6 --json title --jq map(select(.title == "Bump Go to 1.25.6") | .title) | length > 0 (http block)

If you need me to access, download, or install something from one of these locations, you can either:

Configure Actions setup steps to set up my environment, which run before the firewall is enabled
Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

babakks · 2026-01-29T19:52:01Z

.github/workflows/scripts/bump-go.sh

+[[ "$CURRENT_GO_DIRECTIVE" == "null" || -z "$CURRENT_GO_DIRECTIVE" ]] && CURRENT_GO_DIRECTIVE=""
+[[ "$CURRENT_TOOLCHAIN_DIRECTIVE" == "null" || -z "$CURRENT_TOOLCHAIN_DIRECTIVE" ]] && CURRENT_TOOLCHAIN_DIRECTIVE=""


@copilot These vars cannot be "null", right? They're just defaulted to "".

Correct! With jq -r '.Field // ""', the output is always an empty string for null/missing values, never the literal "null". Removed the unnecessary checks in commit b7fd470.

babakks · 2026-01-29T19:52:43Z

.github/workflows/scripts/bump-go.sh

+FINAL_TOOLCHAIN_DIRECTIVE=$(jq -r '.Toolchain // ""' <<< "$FINAL_GO_MOD_JSON")
+
+# Handle empty/null values
+[[ "$FINAL_TOOLCHAIN_DIRECTIVE" == "null" || -z "$FINAL_TOOLCHAIN_DIRECTIVE" ]] && FINAL_TOOLCHAIN_DIRECTIVE=""


@copilot also this.

Fixed in commit b7fd470.

The jq -r flag with // "" operator already returns empty string for null/missing values, never the literal string "null". The checks for == "null" are unnecessary. Co-authored-by: babakks <36728931+babakks@users.noreply.github.com>

babakks · 2026-01-29T19:55:01Z

.github/workflows/scripts/bump-go.sh

+if [[ "$CURRENT_MAJOR_MINOR" = "$LATEST_MAJOR_MINOR" ]]; then
+  # Current go directive is at the same major.minor as latest
+  if [[ -z "$CURRENT_TOOLCHAIN_DIRECTIVE" ]]; then
+    # No toolchain directive present - this is expected when go version matches latest
+    echo "Already on latest Go version: $CURRENT_GO_DIRECTIVE (latest toolchain: $TOOLCHAIN_VERSION)"
+    echo "  → Note: No toolchain directive (expected when go version matches latest toolchain)"
+    exit 0
+  elif [[ "$CURRENT_TOOLCHAIN_DIRECTIVE" = "go$TOOLCHAIN_VERSION" ]]; then
+    echo "Already on latest Go version: $CURRENT_GO_DIRECTIVE (toolchain: $CURRENT_TOOLCHAIN_DIRECTIVE)"
+    exit 0
+  fi
+  # Current go directive is latest but toolchain is outdated - continue to update toolchain
+fi
+
 echo "Creating branch $BRANCH"
 git switch -c "$BRANCH" >/dev/null 2>&1
-
-# ---- Patch go.mod -----------------------------------------------------------
-if [[ "$CURRENT_GO_DIRECTIVE" != "$GO_DIRECTIVE_VERSION" ]]; then
-  sed -Ei.bak "s/^go [0-9]+\.[0-9]+.*$/go $GO_DIRECTIVE_VERSION/" "$GO_MOD"
-  echo "  • go directive $CURRENT_GO_DIRECTIVE → $GO_DIRECTIVE_VERSION"
+BRANCH_CREATED=1


@williammartin maybe we should get rid of this part, and apply the toolchain regardess. Then run a tidy at the end to wrap up?

Initial plan

d17554b

Copilot AI assigned Copilot and williammartin Jan 29, 2026

Copilot started work on behalf of williammartin January 29, 2026 19:05 View session

Copilot AI and others added 3 commits January 29, 2026 19:11

Copilot AI changed the title ~~[WIP] Update bump-go.sh to handle missing toolchain gracefully~~ Fix bump-go.sh to tolerate missing toolchain directive Jan 29, 2026

Copilot finished work on behalf of williammartin January 29, 2026 19:19

Copilot AI requested a review from williammartin January 29, 2026 19:19

Copilot started work on behalf of williammartin January 29, 2026 19:41 View session

Copilot finished work on behalf of williammartin January 29, 2026 19:45

babakks reviewed Jan 29, 2026

View reviewed changes

Copilot started work on behalf of babakks January 29, 2026 19:53 View session

Remove unnecessary null checks in jq output handling

b7fd470

The jq -r flag with // "" operator already returns empty string for null/missing values, never the literal string "null". The checks for == "null" are unnecessary. Co-authored-by: babakks <36728931+babakks@users.noreply.github.com>

babakks reviewed Jan 29, 2026

View reviewed changes

Copilot AI requested a review from babakks January 29, 2026 19:55

Copilot finished work on behalf of babakks January 29, 2026 19:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix bump-go.sh to tolerate missing toolchain directive#12581

Fix bump-go.sh to tolerate missing toolchain directive#12581
Copilot wants to merge 6 commits intotrunkfrom
copilot/update-bump-go-script-resilience

Copilot AI commented Jan 29, 2026 •

edited

Loading

Uh oh!

williammartin commented Jan 29, 2026

Uh oh!

Copilot AI commented Jan 29, 2026 •

edited

Loading

I tried to connect to the following addresses, but was blocked by firewall rules:

Uh oh!

babakks Jan 29, 2026

Uh oh!

Copilot AI Jan 29, 2026

Uh oh!

babakks Jan 29, 2026

Uh oh!

Copilot AI Jan 29, 2026

Uh oh!

babakks Jan 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		[[ "$CURRENT_GO_DIRECTIVE" == "null" \|\| -z "$CURRENT_GO_DIRECTIVE" ]] && CURRENT_GO_DIRECTIVE=""
		[[ "$CURRENT_TOOLCHAIN_DIRECTIVE" == "null" \|\| -z "$CURRENT_TOOLCHAIN_DIRECTIVE" ]] && CURRENT_TOOLCHAIN_DIRECTIVE=""

Conversation

Copilot AI commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary: Fix bump-go.sh to tolerate missing toolchain directive

Latest Changes (This Commit)

Previous Changes

Uh oh!

williammartin commented Jan 29, 2026

Uh oh!

Copilot AI commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

I tried to connect to the following addresses, but was blocked by firewall rules:

Uh oh!

babakks Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

babakks Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

babakks Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Jan 29, 2026 •

edited

Loading

Copilot AI commented Jan 29, 2026 •

edited

Loading