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

ci: use alpine in dockerfile and bump go version (backport #15703) #15718

Merged
merged 2 commits into from
Apr 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 2023

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

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/docker.yml

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

# Conflicts:
#	.github/workflows/docker.yml
@mergify mergify bot requested a review from a team as a code owner April 6, 2023 09:44
@mergify mergify bot added the conflicts label Apr 6, 2023
@julienrbrt julienrbrt changed the title ci: use alpine in dockerfile (backport #15703) ci: use alpine in dockerfile and bump go version (backport #15703) Apr 6, 2023
@julienrbrt julienrbrt merged commit 0867a91 into release/v0.47.x Apr 6, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15703 branch April 6, 2023 09:53
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: No status
Development

Successfully merging this pull request may close these issues.

1 participant