From 7b20b7c0b79bc73a449eeb6da0bf38d51b70c5c6 Mon Sep 17 00:00:00 2001 From: charleshofer Date: Thu, 27 Mar 2025 11:58:59 -0500 Subject: [PATCH] Use rebase for upstream sync (#325) --- .github/workflows/rocm-nightly-upstream-sync.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rocm-nightly-upstream-sync.yml b/.github/workflows/rocm-nightly-upstream-sync.yml index 0f52d44e3..51e7a1cda 100644 --- a/.github/workflows/rocm-nightly-upstream-sync.yml +++ b/.github/workflows/rocm-nightly-upstream-sync.yml @@ -38,7 +38,7 @@ jobs: - name: Create branch run: | git fetch - git checkout origin/main + git checkout origin/main git checkout -b $SYNC_BRANCH_NAME # Try and merge rocm-main into this new branch so that we don't run upstream's CI code git config --global user.email "github-actions@github.com" @@ -60,7 +60,7 @@ jobs: - name: Open a PR to rocm-main run: | gh pr create --repo $GITHUB_REPOSITORY --head $SYNC_BRANCH_NAME --base rocm-main --title "CI: $(date +%x) upstream sync" --body "Daily sync with upstream" - gh pr merge --repo $GITHUB_REPOSITORY --merge --auto $SYNC_BRANCH_NAME + gh pr merge --repo $GITHUB_REPOSITORY --rebase --auto $SYNC_BRANCH_NAME env: GH_TOKEN: ${{ steps.generate-token.outputs.token }}