-
Notifications
You must be signed in to change notification settings - Fork 232
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix #579 Auto-merge between branches
Signed-off-by: Peixin Li <pxli@nyu.edu>
- Loading branch information
Showing
2 changed files
with
24 additions
and
0 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Workflow | ||
## auto-merge | ||
This workflow is triggered hourly to auto-merge `HEAD` to `BASE` (now `branch-0.2` to `branch-0.3`). | ||
If auto-merge PR is unable to be merged due to conflicts, it will remain open until being manually fixed. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# A workflow to keep BASE branch up-to-date from HEAD branch | ||
name: auto-merge HEAD to BASE | ||
|
||
on: | ||
schedule: | ||
- cron: '0 * * * *' # hourly | ||
|
||
jobs: | ||
auto-merge: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: auto-merge job | ||
if: ${{ github.ref == 'refs/heads/branch-0.2' }} # make sure this workflow would not be triggered by other refs | ||
uses: docker://pxli/automerge:latest # https://gitlab-master.nvidia.com/peixinl/automerge | ||
env: | ||
OWNER: NVIDIA | ||
REPO_NAME: spark-rapids | ||
HEAD: branch-0.2 | ||
BASE: branch-0.3 | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |