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

test: fix faucet test (backport #4543) #4544

Merged
merged 2 commits into from
Feb 26, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2025


This is an automatic backport of pull request #4543 done by [Mergify](https://mergify.com).

* test: fix faucet test

* cl

(cherry picked from commit c60540e)

# Conflicts:
#	ignite/pkg/cosmosfaucet/client_http.go
Copy link
Contributor Author

mergify bot commented Feb 26, 2025

Cherry-pick of c60540e has failed:

On branch mergify/bp/release/v28.x.y/pr-4543
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit c60540e0.
  (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:   changelog.md
	modified:   ignite/pkg/chaincmd/runner/runner.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ignite/pkg/cosmosfaucet/client_http.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@julienrbrt julienrbrt merged commit b40b587 into release/v28.x.y Feb 26, 2025
42 of 45 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4543 branch February 26, 2025 12:55
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.

1 participant