Fix upstream PR workflow to use origin branches (#151)

This commit is contained in:
charleshofer 2024-11-22 15:41:48 -06:00 committed by GitHub
parent 3be7c1e63a
commit 2f28601608
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -20,8 +20,9 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Rebase code to main
run: |
git checkout -b $NEW_BRANCH_NAME ${{ github.head_ref }}
git rebase --onto main
git fetch
git checkout -b $NEW_BRANCH_NAME origin/${{ github.head_ref }}
git rebase --onto origin/main
git push origin HEAD
# TODO: Change the base of the PR to upstream main
- name: Create a PR to upstream