From e833d39763e9ea6269870c733f6fb29b22fc1ea5 Mon Sep 17 00:00:00 2001 From: Tim Liu Date: Tue, 26 Mar 2024 11:12:17 +0800 Subject: [PATCH] Auto merge PRs to branch-24.06 from branch-24.04 [skip ci] (#10623) Signed-off-by: Tim Liu --- .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 c209a7109cd..f049bad0a25 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-24.02 + - branch-24.04 types: [closed] jobs: @@ -29,13 +29,13 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: branch-24.02 # force to fetch from latest upstream instead of PR ref + ref: branch-24.04 # 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-24.02 - BASE: branch-24.04 + HEAD: branch-24.04 + BASE: branch-24.06 AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR