Update automerge workflow to support file_use_base and new branching pattern #40
Conversation
This file contains hidden or 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
…pattern Signed-off-by: Peixin Li <[email protected]>
Co-authored-by: Copilot <[email protected]>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates the automerge workflow to incorporate a file_use_base option and support a new branching pattern while migrating the JNI auto‐merge strategy and deprecating the old auto-merge action.
- Introduces file_use_base support in the GitHub workflow.
- Updates branching logic to support release/X.Y to main merging.
- Migrates JNI auto-merge functionality and deprecates previous auto-merge steps.
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| action-helper/python/utils.py | Adds PullRequest and helper functions for automerge. |
| action-helper/python/auto-merge | Implements the python entrypoint for auto-merge. |
| action-helper/entrypoint.sh | Shell entrypoint for the action helper. |
| action-helper/action.yml | Defines the action metadata and inputs. |
| action-helper/Dockerfile | Sets up the docker image for running the action helper. |
| .github/workflows/auto-merge.yml | Configures the workflow with new branching and file_use_base features. |
Comments suppressed due to low confidence (1)
.github/workflows/auto-merge.yml:109
- [nitpick] The error message uses
$BASE directly, which might be unclear. Consider using an explicit reference (e.g. $ {env.BASE}) or clarifying the variable name for better readability.
echo "Failed to find $BASE. Skip auto-merge..."
YanxuanLiu
approved these changes
Jun 17, 2025
pxLi
added a commit
to NVIDIA/spark-rapids-jni
that referenced
this pull request
Jun 17, 2025
follow-up of NVIDIA/spark-rapids-common#40, target 25.06 to have some sanity check after merge as workflow update only 1. Migrated automerge strategy to the share action in the common repo 2. Removed deprecated script in JNI repo This has been verified in forked repo, I will do post verification after merge and revert this change is any issue Signed-off-by: Peixin Li <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
fix #6 and #36
Cases:
Plugin branch-25.06 to branch-25.08: https://github.com/pxLi/spark-rapids/actions/runs/15671686947/job/44143832505
Plugin skipped auto-merge due to vX.Y.0 tag exists: https://github.com/pxLi/spark-rapids/actions/runs/15671714990/job/44144626269
JNI branch-25.06 to branch-25.08: https://github.com/pxLi/spark-rapids-jni/actions/runs/15673010021/job/44147327479
JNI release/25.08 to main: https://github.com/pxLi/spark-rapids-jni/actions/runs/15673971509/job/44150070792
