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

fix: Enable build in pre-montery machines (backport #1351) #1358

Merged
merged 3 commits into from
Apr 27, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 27, 2022

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

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

You are currently cherry-picking commit c6ef107.
  (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:   go.mod

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

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

(cherry picked from commit c6ef107)

# Conflicts:
#	go.sum
@mergify mergify bot added the conflicts label Apr 27, 2022
@alexanderbez alexanderbez merged commit 4da7a77 into v7.x Apr 27, 2022
@alexanderbez alexanderbez deleted the mergify/bp/v7.x/pr-1351 branch April 27, 2022 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants