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

feat: in-place testnet creator (backport #7374) #7424

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #7374 done by Mergify.
Cherry-pick of 0b32654 has failed:

On branch mergify/bp/v22.x/pr-7374
Your branch is up to date with 'origin/v22.x'.

You are currently cherry-picking commit 0b326547.
  (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:   app/app.go
	modified:   cmd/osmosisd/cmd/root.go
	modified:   go.mod
	modified:   osmomath/go.mod
	modified:   osmoutils/go.mod
	modified:   x/epochs/go.mod
	modified:   x/ibc-hooks/go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.sum

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


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

* plug in testnetify

* fix import

* utilize appOpts

* add upgrade trigger

* update sdk fork tag

* add changelog

(cherry picked from commit 0b32654)

# Conflicts:
#	CHANGELOG.md
#	go.sum
@mergify mergify bot added the conflicts label Feb 6, 2024
@github-actions github-actions bot added C:x/epochs C:app-wiring Changes to the app folder labels Feb 6, 2024
@czarcas7ic czarcas7ic merged commit 350901e into v22.x Feb 6, 2024
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v22.x/pr-7374 branch February 6, 2024 23:39
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