Skip to content

Commit

Permalink
fix #579 Auto-merge between branches
Browse files Browse the repository at this point in the history
Signed-off-by: Peixin Li <pxli@nyu.edu>
  • Loading branch information
pxLi committed Aug 19, 2020
1 parent a4e86f6 commit c44eac6
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/README.md
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.
20 changes: 20 additions & 0 deletions .github/workflows/auto-merge.yml
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 }}

0 comments on commit c44eac6

Please sign in to comment.