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.

Sign up for GitHub

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

Jump to bottom

Add signoff option #336

Merged
merged 3 commits into from
Apr 15, 2022
Merged

Add signoff option #336

merged 3 commits into from
Apr 15, 2022

Conversation

iliapolo
Copy link
Contributor

Apologies for jumping the gun here but since this is a fairly simple addition, I went ahead and created a PR. Hope this makes it in :)

Fixes #335

@sorenlouv
Copy link
Owner

This is great! Thanks for doing this! Will run the CI and do some manual tests and merge today or sometime this week.

@iliapolo
Copy link
Contributor Author

@sqren I fixed the failing test with this commit. Any idea why the checks aren't being re-triggered?

@sorenlouv
Copy link
Owner

@sqren I fixed the failing test with this commit. Any idea why the checks aren't being re-triggered?

No idea. Until I pushed your commit didn't even show up as part of this PR. I'm tempted to blame this on a Github bug but not sure. Either way, it works now.

@sorenlouv sorenlouv merged commit 0d81e2a into sorenlouv:main Apr 15, 2022
@sorenlouv
Copy link
Owner

I've released this in v8.4.0. Please try it out and lmk if it works as expected.
Thank you for the contribution! 🎉

@iliapolo iliapolo mentioned this pull request Apr 24, 2022
Merged
@iliapolo
Copy link
Contributor Author

@sqren Thanks for releasing this so quickly!

I'm trying to test this out in our repo. I'd like to use your GitHub Action to do automatic backports based on labels, but I don't think the latest version of the action uses the new version of the CLI.

Do you need to cut a release for the action as well? is there some workaround I can employ to control the version of backport being used in the action?

Thanks!

@iliapolo iliapolo deleted the feat/signoff branch April 26, 2022 13:55
@iliapolo iliapolo mentioned this pull request Apr 27, 2022
Merged
@iliapolo
Copy link
Contributor Author

@sqren I managed to workaround this by directly using the CLI instead of the GitHub action.

If you want to take a look: cdk8s-team/cdk8s-plus#655

I do however think its worth either auto-upgrading and releasing the action with the latest CLI version, or allow for some escape hatching.

Have a look at projen, which can help you with automatic dependency upgrades (and lots more)

Thanks anyway!

@iliapolo iliapolo mentioned this pull request Apr 27, 2022
Merged
@sorenlouv
Copy link
Owner

Thanks for the heads up. Will bump the version in the GitHub action asap and set up some automation around dependency updates

mergify bot pushed a commit to cdk8s-team/cdk8s-plus that referenced this pull request Apr 27, 2022
@iliapolo
chore: fix backport workflow (#655)
8c57943 
There's currently somewhat of a mess with the backport workflow, which doesn't actually work. 

The action we use is [tibdex/backport@v1](https://github.com/tibdex/backport), which I mistakenly thought was internally using the [backport](https://github.com/sqren/backport) tool i've been testing this out with. The correct action to use is actually [sqren/backport-github-action](https://github.com/sqren/backport-github-action). 

However, the action doesn't currently use the correct version of `backport` that contains the [fix](sorenlouv/backport#336) we need for DCO to pass.

I asked the author to cut a new release, but he hasn't responded yet. I then realized the action is not really necessary, since most of the logic is implemented in the `backport` tool (finally a well moduled action). So this PR configures the workflow to use the `backport` tool as a normal `run` step, via projen.  


Signed-off-by: Eli Polonsky <[email protected]>
cdk8s-automation pushed a commit to cdk8s-team/cdk8s-plus that referenced this pull request Apr 27, 2022
@iliapolo
chore: fix backport workflow (#655)
0a7b2be 
There's currently somewhat of a mess with the backport workflow, which doesn't actually work.

The action we use is [tibdex/backport@v1](https://github.com/tibdex/backport), which I mistakenly thought was internally using the [backport](https://github.com/sqren/backport) tool i've been testing this out with. The correct action to use is actually [sqren/backport-github-action](https://github.com/sqren/backport-github-action).

However, the action doesn't currently use the correct version of `backport` that contains the [fix](sorenlouv/backport#336) we need for DCO to pass.

I asked the author to cut a new release, but he hasn't responded yet. I then realized the action is not really necessary, since most of the logic is implemented in the `backport` tool (finally a well moduled action). So this PR configures the workflow to use the `backport` tool as a normal `run` step, via projen.

Signed-off-by: Eli Polonsky <[email protected]>
(cherry picked from commit 8c57943)
Signed-off-by: Eli Polonsky <[email protected]>
cdk8s-automation pushed a commit to cdk8s-team/cdk8s-plus that referenced this pull request Apr 27, 2022
@iliapolo
chore: fix backport workflow (#655)
c0c4148 
There's currently somewhat of a mess with the backport workflow, which doesn't actually work.

The action we use is [tibdex/backport@v1](https://github.com/tibdex/backport), which I mistakenly thought was internally using the [backport](https://github.com/sqren/backport) tool i've been testing this out with. The correct action to use is actually [sqren/backport-github-action](https://github.com/sqren/backport-github-action).

However, the action doesn't currently use the correct version of `backport` that contains the [fix](sorenlouv/backport#336) we need for DCO to pass.

I asked the author to cut a new release, but he hasn't responded yet. I then realized the action is not really necessary, since most of the logic is implemented in the `backport` tool (finally a well moduled action). So this PR configures the workflow to use the `backport` tool as a normal `run` step, via projen.

Signed-off-by: Eli Polonsky <[email protected]>
(cherry picked from commit 8c57943)
Signed-off-by: Eli Polonsky <[email protected]>
@sorenlouv
Copy link
Owner

@iliapolo I updated the dependencies for backport-github-action. It follows the same versioning as the underlying backport tool so you can update to 8.4.0 to get the signoff option:

- name: Backport Action
  uses: sqren/[email protected]

@iliapolo
Copy link
Contributor Author

Thanks @sqren - I think I'll stick to directly using the CLI though, at least until the action is automatically upgraded.

I love that basically all of the functionality is in the CLI - so the action is not strictly necessary :)

@iliapolo
Copy link
Contributor Author

Btw I tested the singoff option and it works as expected

@sorenlouv
Copy link
Owner

Perfect, thanks for the feedback. I'll look into automatically updating the github action when the cli tool is updated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support for signed commits
2 participants
@iliapolo @sorenlouv