From 77141687e027b7bdaa9f2568074bf90598f745fa Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 14 Aug 2026 09:26:17 +0000 Subject: [PATCH 1/4] Add changelog fragment when bumping the Go toolchain Co-authored-by: Isaac --- .github/workflows/bump-go-toolchain.yml | 8 ++++++++ .nextchanges/dependency-updates/go-toolchain-go1.26.6.md | 1 + 2 files changed, 9 insertions(+) create mode 100644 .nextchanges/dependency-updates/go-toolchain-go1.26.6.md diff --git a/.github/workflows/bump-go-toolchain.yml b/.github/workflows/bump-go-toolchain.yml index 1954312bdda..e79dcead205 100644 --- a/.github/workflows/bump-go-toolchain.yml +++ b/.github/workflows/bump-go-toolchain.yml @@ -87,6 +87,14 @@ jobs: fi done < <(git ls-files '**/go.mod' 'go.mod') + - name: Add changelog fragment + if: steps.check.outputs.needed == 'true' + env: + TOOLCHAIN: ${{ steps.latest.outputs.toolchain }} + run: | + echo "Bump Go toolchain to ${TOOLCHAIN}." \ + > ".nextchanges/dependency-updates/go-toolchain-${TOOLCHAIN}.md" + - name: Show diff if: steps.check.outputs.needed == 'true' run: git diff diff --git a/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md b/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md new file mode 100644 index 00000000000..b1a404c9f0b --- /dev/null +++ b/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md @@ -0,0 +1 @@ +Bump Go toolchain to go1.26.6. From 6988abe94822b7f5540c4ba372e4492d83ac6be2 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 14 Aug 2026 09:30:59 +0000 Subject: [PATCH 2/4] Strip go prefix in changelog entry to match prior bumps Co-authored-by: Isaac --- .github/workflows/bump-go-toolchain.yml | 2 +- .nextchanges/dependency-updates/go-toolchain-go1.26.6.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-go-toolchain.yml b/.github/workflows/bump-go-toolchain.yml index e79dcead205..62a8932af07 100644 --- a/.github/workflows/bump-go-toolchain.yml +++ b/.github/workflows/bump-go-toolchain.yml @@ -92,7 +92,7 @@ jobs: env: TOOLCHAIN: ${{ steps.latest.outputs.toolchain }} run: | - echo "Bump Go toolchain to ${TOOLCHAIN}." \ + echo "Bump Go toolchain to ${TOOLCHAIN#go}." \ > ".nextchanges/dependency-updates/go-toolchain-${TOOLCHAIN}.md" - name: Show diff diff --git a/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md b/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md index b1a404c9f0b..67d290e44ac 100644 --- a/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md +++ b/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md @@ -1 +1 @@ -Bump Go toolchain to go1.26.6. +Bump Go toolchain to 1.26.6. From a3b2ea6a87899eafa523cc6bacf6a1b815dbd8dc Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 14 Aug 2026 13:03:21 +0000 Subject: [PATCH 3/4] Reference the PR link in the Go toolchain changelog fragment Address review feedback: expand the PR link in the 1.26.6 fragment, and generate future fragments after the PR is created so they can reference the PR number. Co-authored-by: Isaac --- .github/workflows/bump-go-toolchain.yml | 29 ++++++++++++++----- .../go-toolchain-go1.26.6.md | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bump-go-toolchain.yml b/.github/workflows/bump-go-toolchain.yml index 62a8932af07..e27e612943c 100644 --- a/.github/workflows/bump-go-toolchain.yml +++ b/.github/workflows/bump-go-toolchain.yml @@ -87,19 +87,12 @@ jobs: fi done < <(git ls-files '**/go.mod' 'go.mod') - - name: Add changelog fragment - if: steps.check.outputs.needed == 'true' - env: - TOOLCHAIN: ${{ steps.latest.outputs.toolchain }} - run: | - echo "Bump Go toolchain to ${TOOLCHAIN#go}." \ - > ".nextchanges/dependency-updates/go-toolchain-${TOOLCHAIN}.md" - - name: Show diff if: steps.check.outputs.needed == 'true' run: git diff - name: Create pull request + id: cpr if: steps.check.outputs.needed == 'true' && inputs.version == '' uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1 with: @@ -112,3 +105,23 @@ jobs: Release notes: https://go.dev/doc/devel/release#${{ steps.latest.outputs.toolchain }} reviewers: simonfaltum,andrewnester,anton-107,denik,janniklasrose,pietern,shreyas-goenka labels: dependencies + + # Add the changelog fragment as a follow-up commit on the PR branch: the + # fragment references the PR number, which only exists once the PR above + # has been created. + - name: Add changelog fragment + if: steps.cpr.outputs.pull-request-number + env: + TOOLCHAIN: ${{ steps.latest.outputs.toolchain }} + BRANCH: ${{ steps.cpr.outputs.pull-request-branch }} + PR: ${{ steps.cpr.outputs.pull-request-number }} + run: | + git fetch origin "$BRANCH" + git checkout -f -B "$BRANCH" FETCH_HEAD + fragment=".nextchanges/dependency-updates/go-toolchain-${TOOLCHAIN}.md" + echo "Bump Go toolchain to ${TOOLCHAIN#go} ([#${PR}](https://github.com/databricks/cli/pull/${PR}))." > "$fragment" + git add "$fragment" + git -c user.name='github-actions[bot]' \ + -c user.email='41898282+github-actions[bot]@users.noreply.github.com' \ + commit -m "Add changelog fragment" + git push origin "HEAD:$BRANCH" diff --git a/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md b/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md index 67d290e44ac..d45478bc8d5 100644 --- a/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md +++ b/.nextchanges/dependency-updates/go-toolchain-go1.26.6.md @@ -1 +1 @@ -Bump Go toolchain to 1.26.6. +Bump Go toolchain to 1.26.6 ([#6266](https://github.com/databricks/cli/pull/6266)). From 03661bc6e9c619afa24d0ecc835796fffe90b9e4 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 14 Aug 2026 13:10:09 +0000 Subject: [PATCH 4/4] yamlfmt: strip trailing newline on final run block Co-authored-by: Isaac --- .github/workflows/bump-go-toolchain.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-go-toolchain.yml b/.github/workflows/bump-go-toolchain.yml index e27e612943c..e91c7f37ec7 100644 --- a/.github/workflows/bump-go-toolchain.yml +++ b/.github/workflows/bump-go-toolchain.yml @@ -115,7 +115,7 @@ jobs: TOOLCHAIN: ${{ steps.latest.outputs.toolchain }} BRANCH: ${{ steps.cpr.outputs.pull-request-branch }} PR: ${{ steps.cpr.outputs.pull-request-number }} - run: | + run: |- git fetch origin "$BRANCH" git checkout -f -B "$BRANCH" FETCH_HEAD fragment=".nextchanges/dependency-updates/go-toolchain-${TOOLCHAIN}.md"