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

Ensure go v1.18 used in make build & make install (backport #3634) #3639

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2022

This is an automatic backport of pull request #3634 done by Mergify.
Cherry-pick of f52cb53 has failed:

On branch mergify/bp/v12.x/pr-3634
Your branch is up to date with 'origin/v12.x'.

You are currently cherry-picking commit f52cb533.
  (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:   Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* Apply @jhernandez ' patch to Makefil

* Add changelog

(cherry picked from commit f52cb53)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team December 6, 2022 02:52
@mergify mergify bot added the conflicts label Dec 6, 2022
@github-actions github-actions bot added C:docs Improvements or additions to documentation T:build labels Dec 6, 2022
@mergify mergify bot deleted the mergify/bp/v12.x/pr-3634 branch December 12, 2022 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:docs Improvements or additions to documentation conflicts T:build
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant