Skip to content
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.

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

bump go 1.22.5 (backport #4916) #4936

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 31, 2024


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

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>
(cherry picked from commit 4dc1f47)

# Conflicts:
#	.github/workflows/broken-link-checker.yml
#	.github/workflows/vulnerability-scan.yml
#	docs/source/prereqs.md
@mergify mergify bot requested a review from a team as a code owner July 31, 2024 11:57
@mergify mergify bot added the conflicts label Jul 31, 2024
@mergify mergify bot requested a review from a team as a code owner July 31, 2024 11:57
Copy link
Author

mergify bot commented Jul 31, 2024

Cherry-pick of 4dc1f47 has failed:

On branch mergify/bp/release-2.5/pr-4916
Your branch is up to date with 'origin/release-2.5'.

You are currently cherry-picking commit 4dc1f475d.
  (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/workflows/release.yml
	modified:   .github/workflows/verify-build.yml
	modified:   Makefile
	modified:   vagrant/golang.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/broken-link-checker.yml
	deleted by us:   .github/workflows/vulnerability-scan.yml
	both modified:   docs/source/prereqs.md

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

@mergify mergify bot mentioned this pull request Jul 31, 2024
@satota2 satota2 closed this Jul 31, 2024
@mergify mergify bot deleted the mergify/bp/release-2.5/pr-4916 branch July 31, 2024 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants