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

Make a CI action / label, that makes it easy to cherry-pick just a commit against cosmos SDK main #268

Closed
ValarDragon opened this issue Jun 20, 2022 · 6 comments · Fixed by cosmos/cosmos-sdk#12478
Assignees

Comments

@ValarDragon
Copy link
Member

Background

Lets get a mergify setup, that makes it easy for us to PR a commit against SDK main.

Would be great if possible to do with maintaining the Osmosis fork developer contribution info on SDK main, but I think we can figure that out secondarily.

Suggested Design

Setup mergify in the fork to PR to SDK main

Acceptance Criteria

Adding a label automatically opens a PR against SDK main

@daniel-farina daniel-farina moved this to Needs Review 🔍 in Osmosis Chain Development Jun 20, 2022
@ValarDragon ValarDragon moved this from Needs Review 🔍 to Todo 🕒 in Osmosis Chain Development Jun 27, 2022
@ValarDragon
Copy link
Member Author

Turns out mergify can't do PR's across forks :(

We just want something that does exactly what Mergify does, but PR to another fork.

@alexanderbez @ValarDragon @marbar3778 didn't find such a tool on quick look, but it surely has to exist? (Or is there a way to fork mergify to get in there?)

@xBalbinus xBalbinus moved this from Todo 🕒 to In Progress🏃 in Osmosis Chain Development Jun 27, 2022
@alexanderbez
Copy link

I took a quick look and couldn't find anything. Honestly, I would just write a script and use a github action with a github token to auto create PRs -- we also get credit this way too.

@xBalbinus
Copy link

xBalbinus commented Jun 28, 2022 via email

@xBalbinus
Copy link

xBalbinus commented Jun 30, 2022

Slight latency on this due to some work on proto-correctness CI, heads up.

@xBalbinus
Copy link

May be closed by cosmos#12436; testing still needs to happen.

@xBalbinus xBalbinus moved this from In Progress🏃 to Needs Review 🔍 in Osmosis Chain Development Jul 6, 2022
mergify bot pushed a commit to cosmos/cosmos-sdk that referenced this issue Jul 27, 2022
…it against cosmos SDK main (#12478)

## Description

Closes: [#268](osmosis-labs#268)

Adds a Github action that makes it easy to cherry pick commits from a fork PR to main under fork-cherry-pick.yml. The necessity for this PR arises from Mergify / GitHub marketplace currently not having tooling for this kind of action.

How it works:

- Cherry picks the commit of any fork of cosmos-sdk upon a merged PR to main on fork.
- Puts commit into a `pr-patch` branch; makes PR from pr-patch to cosmos:main

---

### Author Checklist

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [x] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
- [x] provided a link to the relevant issue or specification
- [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules)
- [x] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing)
- [x] added a changelog entry to `CHANGELOG.md`
- [-] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [x] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] confirmed all CI checks have passed

### Reviewers Checklist

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed 
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)
@xBalbinus
Copy link

Finished

Repository owner moved this from Needs Review 🔍 to Done ✅ in Osmosis Chain Development Jul 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
3 participants