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: test ledger in build CI (backport #14642) #14653

Merged
merged 2 commits into from
Jan 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2023

This is an automatic backport of pull request #14642 done by Mergify.
Cherry-pick of 781a4d6 has failed:

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

You are currently cherry-picking commit 781a4d6d7.
  (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:   .github/workflows/build.yml
	both modified:   go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/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

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 781a4d6)

# Conflicts:
#	.github/workflows/build.yml
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
@mergify mergify bot requested a review from a team as a code owner January 17, 2023 14:55
@mergify mergify bot added the conflicts label Jan 17, 2023
@julienrbrt julienrbrt self-assigned this Jan 17, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) January 17, 2023 15:12
@julienrbrt julienrbrt merged commit 6825383 into release/v0.47.x Jan 17, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14642 branch January 17, 2023 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants