mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 10:17:22 +01:00
ci: change invalid branch name for rollup
This commit is contained in:
parent
b68773bb1c
commit
8f971934f3
1 changed files with 5 additions and 5 deletions
10
.github/workflows/rollup.yml
vendored
10
.github/workflows/rollup.yml
vendored
|
|
@ -1,4 +1,4 @@
|
||||||
name: Rollup changes to next version
|
name: Rollup changes to next version
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
ref: ${{ matrix.branches }}
|
ref: ${{ matrix.branches }}
|
||||||
token: ${{ secrets.UPDATE_PAT }}
|
token: ${{ secrets.UPDATE_PAT }}
|
||||||
- name: Create update branch
|
- name: Create update branch
|
||||||
run: git checkout -b ${{ matrix.branches }}/rollup
|
run: git checkout -b ${{ matrix.branches }}-rollup
|
||||||
- name: Initialize mandatory git config
|
- name: Initialize mandatory git config
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name "github-actions[bot]"
|
git config --global user.name "github-actions[bot]"
|
||||||
|
|
@ -35,14 +35,14 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git fetch
|
git fetch
|
||||||
git merge -s recursive -X ours origin/master
|
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
|
- name: Create PR
|
||||||
run: |
|
run: |
|
||||||
echo ${{ secrets.UPDATE_PAT }} | gh auth login --with-token
|
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
|
if [ -z "$prNumber" ]; then
|
||||||
echo "No PR found, creating one"
|
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
|
else
|
||||||
echo "PR already exists, ignoring"
|
echo "PR already exists, ignoring"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue