Skip to content

Commit

Permalink
Support auto-merge for branch-0.4 (NVIDIA#1210)
Browse files Browse the repository at this point in the history
Signed-off-by: Peixin Li <pxli@nyu.edu>
  • Loading branch information
pxLi authored Nov 30, 2020
1 parent b20fde4 commit 79e90d3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ name: auto-merge HEAD to BASE
on:
pull_request_target:
branches:
- branch-0.2
- branch-0.3
types: [closed]

jobs:
Expand All @@ -29,13 +29,13 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
ref: branch-0.2 # force to fetch from latest upstream instead of PR ref
ref: branch-0.3 # 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
HEAD: branch-0.2
BASE: branch-0.3
HEAD: branch-0.3
BASE: branch-0.4
AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR
8 changes: 4 additions & 4 deletions scripts/generate-changelog
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ Dependencies:
Usage:
cd spark-rapids/
# generate changelog for release 0.1,0.2
scripts/changelog --token=<GITHUB_PERSONAL_ACCESS_TOKEN> --releases=0.1,0.2
# generate changelog for release 0.1,0.2,0.3
scripts/changelog --token=<GITHUB_PERSONAL_ACCESS_TOKEN> --releases=0.1,0.2,0.3
# generate changelog for release 0.1,0.2 to /tmp/CHANGELOG.md
GITHUB_TOKEN=XXX scripts/changelog --releases=0.1,0.2 --path=/tmp/CHANGELOG.md
# generate changelog for release 0.1,0.2,0.3 to /tmp/CHANGELOG.md
GITHUB_TOKEN=XXX scripts/changelog --releases=0.1,0.2,0.3 --path=/tmp/CHANGELOG.md
"""
import os
import sys
Expand Down

0 comments on commit 79e90d3

Please sign in to comment.