Merge pull request #11259 from cli/wm/ensure-go-directive-is-always-0
Ensure go directive is always .0 version in bump
This commit is contained in:
commit
330d188d53
1 changed files with 3 additions and 4 deletions
7
.github/workflows/scripts/bump-go.sh
vendored
7
.github/workflows/scripts/bump-go.sh
vendored
|
|
@ -40,7 +40,9 @@ echo "Fetching latest stable Go version…"
|
|||
LATEST_JSON=$(curl -fsSL https://go.dev/dl/?mode=json | jq -c '[.[] | select(.stable==true)][0]')
|
||||
FULL_VERSION=$(jq -r '.version' <<< "$LATEST_JSON") # e.g. go1.23.4
|
||||
TOOLCHAIN_VERSION="${FULL_VERSION#go}" # e.g. 1.23.4
|
||||
GO_DIRECTIVE_VERSION=$(cut -d. -f1-2 <<< "$TOOLCHAIN_VERSION")
|
||||
# `go mod tidy` will always add `.0` if there is no minor version
|
||||
# so let's just ensure .0 is suffixed to the go directive.
|
||||
GO_DIRECTIVE_VERSION="$(cut -d. -f1-2 <<< "$TOOLCHAIN_VERSION").0"
|
||||
|
||||
echo " → go : $GO_DIRECTIVE_VERSION"
|
||||
echo " → toolchain : $TOOLCHAIN_VERSION"
|
||||
|
|
@ -76,9 +78,6 @@ if [[ "$CURRENT_TOOLCHAIN_DIRECTIVE" != "go$TOOLCHAIN_VERSION" ]]; then
|
|||
echo " • toolchain $CURRENT_TOOLCHAIN_DIRECTIVE → go$TOOLCHAIN_VERSION"
|
||||
fi
|
||||
|
||||
# ---- Run go mod tidy to ensure .0 minor version is added to go directive ----
|
||||
go mod tidy
|
||||
|
||||
rm -f "$GO_MOD.bak"
|
||||
|
||||
git add "$GO_MOD"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue