diff --git a/.github/workflows/rollup.yml b/.github/workflows/rollup.yml index 0aea7a807..a4f74529a 100644 --- a/.github/workflows/rollup.yml +++ b/.github/workflows/rollup.yml @@ -1,4 +1,4 @@ -name: Rollup changes to next version +name: Rollup changes to next version on: push: branches: @@ -25,7 +25,7 @@ jobs: ref: ${{ matrix.branches }} token: ${{ secrets.UPDATE_PAT }} - name: Create update branch - run: git checkout -b ${{ matrix.branches }}/rollup + run: git checkout -b ${{ matrix.branches }}-rollup - name: Initialize mandatory git config run: | git config --global user.name "github-actions[bot]" @@ -35,14 +35,14 @@ jobs: run: | git fetch git merge -s recursive -X ours origin/master - git push origin ${{ matrix.branches }}/rollup --force + git push origin ${{ matrix.branches }}-rollup --force - name: Create PR run: | echo ${{ secrets.UPDATE_PAT }} | gh auth login --with-token - prNumber=$(gh pr list --base ${{ matrix.branches }} --head ${{ matrix.branches }}/rollup --state open --json number --template "{{range .}}{{.number}}{{end}}") + prNumber=$(gh pr list --base ${{ matrix.branches }} --head ${{ matrix.branches }}-rollup --state open --json number --template "{{range .}}{{.number}}{{end}}") if [ -z "$prNumber" ]; then echo "No PR found, creating one" - gh pr create --head ${{ matrix.branches }}/rollup --title "[${{ matrix.branches }}] Rollup changes from master" --body "" --base ${{ matrix.branches }} + gh pr create --head ${{ matrix.branches }}-rollup --title "[${{ matrix.branches }}] Rollup changes from master" --body "" --base ${{ matrix.branches }} else echo "PR already exists, ignoring" fi