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

build: update to go 1.18.9 (backport #5607) #5611

Merged
merged 4 commits into from
Jan 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2023

This is an automatic backport of pull request #5607 done by Mergify.
Cherry-pick of 1833fe6 has failed:

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

You are currently cherry-picking commit 1833fe6df.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .circleci/config.yml
	deleted by us:   .github/workflows/update-changelog.yaml

no changes added to commit (use "git add" and/or "git commit -a")

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Changelog: chore: upgrade golang to 1.18.9 (backport #5607)

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
(cherry picked from commit 1833fe6)

# Conflicts:
#	.circleci/config.yml
#	.github/workflows/update-changelog.yaml
@mergify mergify bot requested a review from a team as a code owner January 9, 2023 14:26
@mergify mergify bot added the conflicts label Jan 9, 2023
@mergify mergify bot mentioned this pull request Jan 9, 2023
12 tasks
lukidzi and others added 3 commits January 9, 2023 16:25
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont merged commit d90dbed into release-1.7 Jan 10, 2023
@michaelbeaumont michaelbeaumont deleted the mergify/bp/release-1.7/pr-5607 branch January 10, 2023 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants