workflows: rebase code on pull_request_target #1622
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The e2e_on_pull workflow run on pull_request_target event that uses the the merge branch. Unlike the pull_request event, the merge branch is not rebased on top of the target branch (usually 'main'). In simple terms, the e2e_on_pull workflow does not automatically rebase the code so that changes merged on 'main' after the pull request creation are disregarded. This added a renamed (to ci-helper.sh) and modified version of https://github.com/kata-containers/kata-containers/blob/main/tests/git-helper.sh that's called after 'actions/checkout' step to rebase the code atop of 'main'. Because the touched workflows may be called on different workflows and events (e.g. release and dispatch_workflow), the rebase step is guarded by `if: github.event_name == 'pull_request_target'` to only run on pull_request_target triggered workflows. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
Tested in https://github.com/wainersm/cc-cloud-api-adaptor/actions/runs/7142483680 which is was triggered by dispatch_workflow, so the rebase step is skipped. |
stevenhorsman
approved these changes
Dec 11, 2023
Comment on lines
+22
to
+25
| if [ -n "${GITHUB_WORKSPACE:-}" ] && [ "$(uname -m)" != "x86_64" ]; then | ||
| echo "Rebase failed, cleaning up a repository for self-hosted runners and exiting" | ||
| cd "${GITHUB_WORKSPACE}"/.. | ||
| sudo rm -rf "${GITHUB_WORKSPACE}" |
There was a problem hiding this comment.
I'm not sure we have this scenario anywhere at the moment? I'm not sure it is particularly harmful to leave in though
There was a problem hiding this comment.
Perhaps it would be safer to use cd "${GITHUB_WORKSPACE}"; sudo rm -rf ., what do you think?
| action="${1:-}" | ||
|
|
||
| case "${action}" in | ||
| rebase-atop-of-the-latest-target-branch) rebase_atop_of_the_latest_target_branch;; |
There was a problem hiding this comment.
nit: I think this case pattern should be indented for readability?
ldoktor
reviewed
Dec 11, 2023
ldoktor
approved these changes
Dec 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The e2e_on_pull workflow run on pull_request_target event that uses the the merge branch. Unlike the pull_request event, the merge branch is not rebased on top of the target branch (usually 'main'). In simple terms, the e2e_on_pull workflow does not automatically rebase the code so that changes merged on 'main' after the pull request creation are disregarded.
This added a renamed (to ci-helper.sh) and modified version of https://github.com/kata-containers/kata-containers/blob/main/tests/git-helper.sh that's called after 'actions/checkout' step to rebase the code atop of 'main'.
Because the touched workflows may be called on different workflows and events (e.g. release and dispatch_workflow), the rebase step is guarded by
if: github.event_name == 'pull_request_target'to only run on pull_request_target triggered workflows.