From e956cfcaf7b9f1aeb061cdbc9a1d51191f2ea862 Mon Sep 17 00:00:00 2001 From: pxLi Date: Mon, 30 Nov 2020 16:16:31 +0800 Subject: [PATCH] Support auto-merge for branch-0.4 (#1210) Signed-off-by: Peixin Li --- .github/workflows/auto-merge.yml | 8 ++++---- scripts/generate-changelog | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 75fd65121f4..26b04f9b5dc 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -18,7 +18,7 @@ name: auto-merge HEAD to BASE on: pull_request_target: branches: - - branch-0.2 + - branch-0.3 types: [closed] jobs: @@ -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 diff --git a/scripts/generate-changelog b/scripts/generate-changelog index 2915a659901..d0284d786db 100755 --- a/scripts/generate-changelog +++ b/scripts/generate-changelog @@ -42,11 +42,11 @@ Dependencies: Usage: cd spark-rapids/ - # generate changelog for release 0.1,0.2 - scripts/changelog --token= --releases=0.1,0.2 + # generate changelog for release 0.1,0.2,0.3 + scripts/changelog --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