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

setup: reuses proto container (backport #9192) #9203

Merged
merged 2 commits into from
Apr 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2021

This is an automatic backport of pull request #9192 done by Mergify.

Cherry-pick of 71b7fb8 has failed:

On branch mergify/bp/release/v0.42.x/pr-9192
Your branch is up to date with 'origin/release/v0.42.x'.

You are currently cherry-picking commit 71b7fb829.
  (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 <file>..." to mark resolution)
	both modified:   Makefile

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* setup: reuses proto container

* push docker image

* set image name

* revert and use latest

Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
(cherry picked from commit 71b7fb8)

# Conflicts:
#	Makefile
@mergify mergify bot added the conflicts label Apr 26, 2021
@mergify mergify bot mentioned this pull request Apr 26, 2021
9 tasks
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robert-zaremba could you take care of fixing the conflicts?

@robert-zaremba
Copy link
Collaborator

could you take care of fixing the conflicts?

done

@robert-zaremba robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label Apr 26, 2021
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@robert-zaremba
Copy link
Collaborator

@aaronc , @alexanderbez - could you merge this? @alessio if you have the rights?

@alessio alessio merged commit c6f53ef into release/v0.42.x Apr 28, 2021
@alessio alessio deleted the mergify/bp/release/v0.42.x/pr-9192 branch April 28, 2021 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants