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

update OSMOSIS_E2E_UPGRADE_VERSION on upgrade handler #4029 (backport #4173) #4176

Merged
merged 2 commits into from
Feb 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2023

This is an automatic backport of pull request #4173 done by Mergify.
Cherry-pick of 386c9f0 has failed:

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

You are currently cherry-picking commit 386c9f05.
  (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:   .github/workflows/gen-upgrade-on-manual-input.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   scripts/empty_upgrade_handler_gen.sh

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

…4173)

(cherry picked from commit 386c9f0)

# Conflicts:
#	scripts/empty_upgrade_handler_gen.sh
@p0mvn
Copy link
Member

p0mvn commented Jan 31, 2023

@MasterPi-2124 hey can you resolve conflicts here please?

@MasterPi-2124
Copy link
Contributor

I dont have write access to the repo so I can not edit the conflict in the code @p0mvn

@p0mvn p0mvn merged commit b163ad2 into v14.x Feb 1, 2023
@p0mvn p0mvn deleted the mergify/bp/v14.x/pr-4173 branch February 1, 2023 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants