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

perf: dockerfiles (backport #14793) #14795

Merged
merged 4 commits into from
Jan 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 26, 2023

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

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

You are currently cherry-picking commit be9bd7a8c.
  (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
	modified:   contrib/devtools/Dockerfile
	modified:   contrib/images/Makefile
	modified:   contrib/images/simd-dlv/Dockerfile
	modified:   contrib/rosetta/rosetta-ci/Dockerfile
	modified:   types/coin.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   Dockerfile
	both modified:   contrib/images/simd-env/Dockerfile

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 be9bd7a)

# Conflicts:
#	CHANGELOG.md
#	Dockerfile
#	contrib/images/simd-env/Dockerfile
@mergify mergify bot requested a review from a team as a code owner January 26, 2023 20:22
@mergify mergify bot added the conflicts label Jan 26, 2023
@github-actions github-actions bot added C:Rosetta Issues and PR related to Rosetta Type: Build labels Jan 26, 2023
@julienrbrt
Copy link
Member

Before merging, let's verify that rosetta does work with v0.47 (the build should pass)

@robert-zaremba
Copy link
Collaborator

Rosetta worked: https://github.com/cosmos/cosmos-sdk/actions/runs/4018911650/jobs/6905110893

@robert-zaremba robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label Jan 26, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) January 26, 2023 21:28
@julienrbrt julienrbrt merged commit 33986a3 into release/v0.47.x Jan 26, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14793 branch January 26, 2023 22:57
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. C:Rosetta Issues and PR related to Rosetta Type: Build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants