From 53958ccf129eb4fa6b2684bfce219bb94f99c90c Mon Sep 17 00:00:00 2001 From: Peixin Li Date: Tue, 20 Jul 2021 10:47:29 +0800 Subject: [PATCH] enable auto-merge from branch 21.08 to 21.10 Signed-off-by: Peixin Li --- .github/workflows/auto-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 61f2d3e3723..4eaafff4b55 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-21.06 + - branch-21.08 types: [closed] jobs: @@ -29,13 +29,13 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: branch-21.06 # force to fetch from latest upstream instead of PR ref + ref: branch-21.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 - HEAD: branch-21.06 - BASE: branch-21.08 + HEAD: branch-21.08 + BASE: branch-21.10 AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR