From 336948e3536a918bf868a55c3e12b963e204abac Mon Sep 17 00:00:00 2001 From: Akira Komamura Date: Sun, 5 Nov 2023 14:51:02 +0900 Subject: [PATCH] ci: Create a PR --- .github/workflows/rebase-onto-upstream.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rebase-onto-upstream.yml b/.github/workflows/rebase-onto-upstream.yml index 43383f11fd8..d3fa0f0f48d 100644 --- a/.github/workflows/rebase-onto-upstream.yml +++ b/.github/workflows/rebase-onto-upstream.yml @@ -25,10 +25,6 @@ jobs: sparse-checkout: '.' ref: ${{ matrix.base_ref }} - - name: Switch the branch - run: | - git switch -C tmp akirak - - name: Fetch the upstream run: | git remote add upstream https://github.com/melpa/melpa.git @@ -40,9 +36,10 @@ jobs: git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com' git rebase -s ort -X theirs upstream/${{ matrix.upstream_branch }} - - name: Push changes - uses: ad-m/github-push-action@master + - uses: peter-evans/create-pull-request@v5 with: - github_token: ${{ secrets.PAT_PUSH }} - branch: '${{ matrix.base_ref }}-tmp' - force: true + base: ${{ matrix.base_ref }} + title: 'Rebase onto upstream' + branch: 'rebase-${{ matrix.base_ref }}' + labels: automation + token: ${{ secrets.PAT_FOR_PR }}