Skip to content

Commit

Permalink
Use reusable auto-merge workflow (#434)
Browse files Browse the repository at this point in the history
Signed-off-by: Peixin Li <[email protected]>
  • Loading branch information
pxLi authored Sep 19, 2024
1 parent 2c0407a commit 3cca58b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 196 deletions.
25 changes: 8 additions & 17 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,16 @@ name: auto-merge HEAD to BASE
on:
pull_request_target:
branches:
- branch-24.08
- branch-*
types: [closed]

jobs:
auto-merge:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
ref: branch-24.08 # force to fetch from latest upstream instead of PR ref

- name: auto-merge job
uses: ./.github/workflows/auto-merge
env:
OWNER: NVIDIA
REPO_NAME: spark-rapids-examples
HEAD: branch-24.08
BASE: branch-24.10
AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR

uses: NVIDIA/spark-rapids-common/.github/workflows/auto-merge.yml@main
with:
owner: ${{ github.repository_owner }}
repo: spark-rapids-examples
branch: ${{ github.event.pull_request.base.ref }}
secrets:
token: ${{ secrets.AUTOMERGE_TOKEN }}
22 changes: 0 additions & 22 deletions .github/workflows/auto-merge/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/auto-merge/action.yml

This file was deleted.

137 changes: 0 additions & 137 deletions .github/workflows/auto-merge/automerge

This file was deleted.

0 comments on commit 3cca58b

Please sign in to comment.