feat: CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main #12478

xBalbinus · 2022-07-07T14:57:35Z

Description

Closes: #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...

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 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)

Currently failing at hub PR action.

tac0turtle · 2022-07-09T11:53:44Z

Cherry picks the commit of any fork of cosmos-sdk upon a merged PR to main on fork.

do we have to go to the repo to tag prs? what is the label we need to request teams to create?

xBalbinus · 2022-07-09T14:33:34Z

No actions needed from team. This action automatically creates a cherry picked PR from pull requests in forks made to main

…

On Sat, Jul 9, 2022 at 7:53 AM Marko ***@***.***> wrote: Cherry picks the commit of any fork of cosmos-sdk upon a merged PR to main on fork. do we have to go to the repo to tag prs? what is the label we need to request teams to create? — Reply to this email directly, view it on GitHub <#12478 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ASH4FPTELL5Y4PY766FDOM3VTFR5HANCNFSM525XNYKQ> . You are receiving this because you authored the thread.Message ID: ***@***.***>

xBalbinus · 2022-07-09T14:34:04Z

P.s. main of fork, which gets cherry picked into PR

…

On Sat, Jul 9, 2022 at 10:33 AM Xiangan He ***@***.***> wrote: No actions needed from team. This action automatically creates a cherry picked PR from pull requests in forks made to main On Sat, Jul 9, 2022 at 7:53 AM Marko ***@***.***> wrote: > Cherry picks the commit of any fork of cosmos-sdk upon a merged PR to > main on fork. > > do we have to go to the repo to tag prs? what is the label we need to > request teams to create? > > — > Reply to this email directly, view it on GitHub > <#12478 (comment)>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/ASH4FPTELL5Y4PY766FDOM3VTFR5HANCNFSM525XNYKQ> > . > You are receiving this because you authored the thread.Message ID: > ***@***.***> >

alexanderbez · 2022-07-25T23:44:26Z

So we have to essentially merge this PR to see if it really works, correct?

tac0turtle · 2022-07-26T07:51:12Z

https://github.com/peepmaster/cosmos-sdk/runs/7390327769?check_suite_focus=true

This is the latest CI run that proves that this 'works'. I'm getting a 403 error from the API for "Forbidden" using the Pull Request API - I think we may have to merge to test this but would love to know what others think of the cause / fixes of the 403.

ah this is because external people don't get keys injected into ci for security purposes by GitHub actions

xBalbinus · 2022-07-26T12:10:26Z

Sorry, I’m not exactly sure what that means in the context of fixing this, could you clarify?

…

On Tue, Jul 26, 2022 at 3:51 AM Marko ***@***.***> wrote: https://github.com/peepmaster/cosmos-sdk/runs/7390327769?check_suite_focus=true This is the latest CI run that proves that this 'works'. I'm getting a 403 error from the API for "Forbidden" using the Pull Request API - I think we may have to merge to test this but would love to know what others think of the cause / fixes of the 403. ah this is because external people don't get keys injected into ci for security purposes by GitHub actions — Reply to this email directly, view it on GitHub <#12478 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ASH4FPWTIIEHPRWFZO5E4K3VV6KHVANCNFSM525XNYKQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

xBalbinus · 2022-07-26T18:57:59Z

Actually sorry, I think I do understand now and that's exactly to our discussion earlier that this needs to be merged in to test.

alexanderbez · 2022-07-26T23:56:55Z

Ok, @marbar3778 are you OK with merging first and seeing if this works? If it doesn't, we either patch it or revert it.

tac0turtle

ack

julienrbrt · 2022-07-27T19:20:37Z

Is it supposed to run at each PR? I don't think it works https://github.com/cosmos/cosmos-sdk/actions/workflows/fork-cherry-pick.yml

tac0turtle · 2022-07-27T20:31:43Z

cc @xBalbinus ^^

xBalbinus · 2022-07-27T20:49:42Z

Ooh hmm, it is supposed to run with each PR, I will debug & see what’s wrong.

…

On Wed, Jul 27, 2022 at 4:31 PM Marko ***@***.***> wrote: cc @xBalbinus <https://github.com/xBalbinus> ^^ — Reply to this email directly, view it on GitHub <#12478 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ASH4FPQVLCSGDK7DNEJSN7DVWGMDVANCNFSM525XNYKQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

xBalbinus · 2022-07-27T21:10:55Z

After a bit of investigation @marbar3778 @julienrbrt , it seems that there's an issue with the origin of the PR?

The way the action is supposed to function is:

User merges a PR into the main branch of a FORK of cosmos/sdk
The same PR gets cherry picked into a PR to the main branch of cosmos/sdk

I think what I need to do here is actually also add another trigger limiter that says this should only trigger from FORK PRs, not main?

julienrbrt · 2022-07-27T21:23:05Z

Alright but why this action is on the Cosmos SDK repo then? If I understand properly it's to the fork that wants to submit PR of their changes that should have this action instead of the Cosmos SDK itself.

xBalbinus · 2022-07-27T21:27:03Z

To my understanding the original reason was that the action would then be generalizable across all forks of cosmos SDK...

xBalbinus · 2022-07-27T21:29:47Z

I've temporarily disabled the workflow as I debug, will re-enable when set.

tac0turtle · 2022-07-27T21:32:00Z

I think it should be disabled at all times on the sdk, then when a fork appears like osmosis, they can reenable it

julienrbrt · 2022-07-27T21:35:20Z

I understand, makes sense.

One more question, what happens if there is two PRs from a same fork? It seems that the branch name is hardcoded to pr-patch, should not we have the commit ID in the branch name for ensuring uniqueness?

xBalbinus · 2022-07-27T21:37:15Z

@marbar3778 Agreed! Thank you for the very good idea.

And @julienrbrt you are totally right on that as well. I will make the branch name pr-patch- to make each unique to avoid bumping into issues like that via. a PR.

Thank you all for your help!

julienrbrt · 2022-07-27T21:40:14Z

While you are at it can you add a name to the workflow :) So it will display better on GitHub.

xBalbinus · 2022-07-27T21:41:34Z

Yessir! You got it.

## Description A sequel to #12478 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. Changelog: - Added templating for the commit-branch that the action creates on the fork. - Added a name to the Github action. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* 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` - [x] 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 · 2022-10-11T07:23:24Z

Unfortunately, I believe so. Would love if you have any other suggestions to test though, I’d gladly take any safer alternative that we hadn’t tried before.

…

On Mon, Jul 25, 2022 at 7:44 PM Aleksandr Bezobchuk < ***@***.***> wrote: So we have to essentially merge this PR to see if it really works, correct? — Reply to this email directly, view it on GitHub <#12478 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ASH4FPR5GGH27JZ6TJEEQPLVV4RGLANCNFSM525XNYKQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

xBalbinus added 12 commits July 6, 2022 18:14

Create fork cherry-picking GH action

7cfdab4

Currently failing at hub PR action.

Update fork-cherry-pick.yml

1f55fe1

Update fork-cherry-pick.yml

8573865

Update fork-cherry-pick.yml

4ab2b85

Update fork-cherry-pick.yml

f612ad7

Update fork-cherry-pick.yml

f0eb7a3

Update fork-cherry-pick.yml

937e8a5

Update fork-cherry-pick.yml

288f203

Update fork-cherry-pick.yml

47ae38e

Update fork-cherry-pick.yml

c659576

Update fork-cherry-pick.yml

d3289e7

Update fork-cherry-pick.yml

89ce84e

xBalbinus requested a review from a team as a code owner July 7, 2022 14:57

github-actions bot added the Type: CI label Jul 7, 2022

alexanderbez changed the title ~~[ci] A CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main~~ feat: CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main Jul 7, 2022

xBalbinus added 8 commits July 7, 2022 11:21

Update fork-cherry-pick.yml

fc46e75

Update fork-cherry-pick.yml

b0ae79c

Update fork-cherry-pick.yml

e13d7d4

Update fork-cherry-pick.yml

230490d

Update fork-cherry-pick.yml

79e0f36

Update fork-cherry-pick.yml

24354f7

Update fork-cherry-pick.yml

b28ae8b

Update fork-cherry-pick.yml

e5ba7e7

xBalbinus added 4 commits July 11, 2022 10:39

Update fork-cherry-pick.yml

c0f3591

Update fork-cherry-pick.yml

89f2731

Update fork-cherry-pick.yml

5f935b1

Update fork-cherry-pick.yml

e75944f

Merge branch 'main' into main

c05b9f3

Merge branch 'main' into main

a262cbf

tac0turtle approved these changes Jul 27, 2022

View reviewed changes

Merge branch 'main' into main

76521af

tac0turtle added the A:automerge Automatically merge PR once all prerequisites pass. label Jul 27, 2022

tac0turtle self-assigned this Jul 27, 2022

Merge branch 'main' into main

22bad1b

julienrbrt approved these changes Jul 27, 2022

View reviewed changes

Merge branch 'main' into main

6df1d6e

mergify bot merged commit 9ffd57a into cosmos:main Jul 27, 2022

xBalbinus mentioned this pull request Jul 27, 2022

ci: Cherry-picking-fork action name; unique commit-branches #12753

Merged

19 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main #12478

feat: CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main #12478

xBalbinus commented Jul 7, 2022 •

edited

Loading

tac0turtle commented Jul 9, 2022

xBalbinus commented Jul 9, 2022 via email

xBalbinus commented Jul 9, 2022 via email

alexanderbez commented Jul 25, 2022

tac0turtle commented Jul 26, 2022

xBalbinus commented Jul 26, 2022 via email

xBalbinus commented Jul 26, 2022

alexanderbez commented Jul 26, 2022

tac0turtle left a comment

julienrbrt commented Jul 27, 2022

tac0turtle commented Jul 27, 2022

xBalbinus commented Jul 27, 2022 via email

xBalbinus commented Jul 27, 2022

julienrbrt commented Jul 27, 2022

xBalbinus commented Jul 27, 2022

xBalbinus commented Jul 27, 2022

tac0turtle commented Jul 27, 2022

julienrbrt commented Jul 27, 2022 •

edited

Loading

xBalbinus commented Jul 27, 2022

julienrbrt commented Jul 27, 2022 •

edited

Loading

xBalbinus commented Jul 27, 2022

xBalbinus commented Oct 11, 2022 via email

feat: CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main #12478

feat: CI action / label that makes it easy to cherry-pick just a commit against cosmos SDK main #12478

Conversation

xBalbinus commented Jul 7, 2022 • edited Loading

Description

Author Checklist

Reviewers Checklist

tac0turtle commented Jul 9, 2022

xBalbinus commented Jul 9, 2022 via email

xBalbinus commented Jul 9, 2022 via email

alexanderbez commented Jul 25, 2022

tac0turtle commented Jul 26, 2022

xBalbinus commented Jul 26, 2022 via email

xBalbinus commented Jul 26, 2022

alexanderbez commented Jul 26, 2022

tac0turtle left a comment

Choose a reason for hiding this comment

julienrbrt commented Jul 27, 2022

tac0turtle commented Jul 27, 2022

xBalbinus commented Jul 27, 2022 via email

xBalbinus commented Jul 27, 2022

julienrbrt commented Jul 27, 2022

xBalbinus commented Jul 27, 2022

xBalbinus commented Jul 27, 2022

tac0turtle commented Jul 27, 2022

julienrbrt commented Jul 27, 2022 • edited Loading

xBalbinus commented Jul 27, 2022

julienrbrt commented Jul 27, 2022 • edited Loading

xBalbinus commented Jul 27, 2022

xBalbinus commented Oct 11, 2022 via email

xBalbinus commented Jul 7, 2022 •

edited

Loading

julienrbrt commented Jul 27, 2022 •

edited

Loading

julienrbrt commented Jul 27, 2022 •

edited

Loading