Skip to content

Conversation

@cujomalainey
Copy link
Contributor

Add a non mandatory check for release branches that help reviewers verify all patches have landed on main before the patch to release branch.

The current configuration requires the cherry-pick command to be run with -x. This can be configured to do subject matching if that is too much for developers.

Copy link
Collaborator

@marc-hb marc-hb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea.

Could you make https://github.com/cujomalainey/cherry-pick-check/blob/main/entrypoint.sh a bit more shellcheck-compliant?

Can you also add set -e?

A main function would also be nice:

@marc-hb
Copy link
Collaborator

marc-hb commented Mar 13, 2023

I have barely looked at https://github.com/cujomalainey/cherry-pick-check/blob/main/entrypoint.sh yet but based on the desired feature I just remembered it must be doing something like this old script of mine which is very well tested:
https://github.com/thesofproject/sof-test/blob/main/tools/CI/check-gitrange.bash

A while back I searched for a Github Action that would return the list of submitted commits but all the ones I found surprisingly sucked. I guess it's because most Github users use commits only for "fixups" zephyrproject-rtos/zephyr#53566

There's also the shallow cloning problem: thesofproject/linux#2556, fortunately sof.git is small enough.

Also on my way too long reading list: https://docs.github.com/en/actions/using-workflows/reusing-workflows

@cujomalainey
Copy link
Contributor Author

I have barely looked at https://github.com/cujomalainey/cherry-pick-check/blob/main/entrypoint.sh yet but based on the desired feature I just remembered it must be doing something like this old script of mine which is very well tested: https://github.com/thesofproject/sof-test/blob/main/tools/CI/check-gitrange.bash

That appears to be missing the parent branch check part though. That being said, I admit that is half the script.

@cujomalainey cujomalainey requested a review from marc-hb March 13, 2023 22:12
Add a non mandatory check for release branches that help reviewers
verify all patches have landed on main before the patch to release
branch.

The current configuration requires the cherry-pick command to be run
with -x. This can be configured to do subject matching if that is too
much for developers.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
@cujomalainey cujomalainey changed the title ci: add cherry-pick check for release branches [SKIP CI] ci: add cherry-pick check for release branches Mar 13, 2023
@cujomalainey
Copy link
Contributor Author

@marc-hb shellcheck passes now, I also fixed yaml, if it looks good to you on action side I will push a new release and update the PR.

Copy link
Collaborator

@marc-hb marc-hb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants