Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 10, 2025

What

Why

This will help detect breaking changes when a bump PR is partially updated. In addition, it will remove the extra variable and simplify the auto bump considerably.

Issues

Requires #626


This is an automatic backport of pull request #625 done by [Mergify](https://mergify.com).

(cherry picked from commit 416d57c)

# Conflicts:
#	.github/updatecli.d/bump-microsoft.yml
#	go/base-arm/Dockerfile.tmpl
#	go/base/Dockerfile.tmpl
@mergify mergify bot requested a review from a team as a code owner June 10, 2025 14:04
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 10, 2025
@mergify mergify bot requested review from kaanyalti and michel-laterman June 10, 2025 14:04
@mergify mergify bot assigned v1v Jun 10, 2025
@mergify
Copy link
Author

mergify bot commented Jun 10, 2025

Cherry-pick of 416d57c has failed:

On branch mergify/bp/1.23/pr-625
Your branch is up to date with 'origin/1.23'.

You are currently cherry-picking commit 416d57c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/updatecli.d/bump-go-release-version.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/updatecli.d/bump-microsoft.yml
	both modified:   go/base-arm/Dockerfile.tmpl
	both modified:   go/base/Dockerfile.tmpl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

v1v
v1v previously approved these changes Jun 10, 2025
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jun 10, 2025
@elasticmachine
Copy link

💚 Build Succeeded

History

cc @v1v

@v1v v1v merged commit 428f3c5 into 1.23 Jun 10, 2025
5 checks passed
@v1v v1v deleted the mergify/bp/1.23/pr-625 branch June 10, 2025 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants