Skip to content

Commit

Permalink
ci: Create a PR
Browse files Browse the repository at this point in the history
  • Loading branch information
akirak committed Nov 5, 2023
1 parent 87d26ff commit 336948e
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/rebase-onto-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}

0 comments on commit 336948e

Please sign in to comment.