ci: fix release script

This commit is contained in:
Mark Lawlor
2022-08-29 22:08:17 +10:00
parent 1513c1e2bf
commit 6863d0b384

View File

@@ -56,9 +56,9 @@ jobs:
git config --local user.email "actions@github.com"
git config --local user.name "Github Actions"
- name: Merge master back to next
- name: Merge main back to next
run: |
git checkout next
git pull
git merge --no-ff master -m "Auto-merge master back to next"
git merge --no-ff main -m "Auto-merge main back to next"
git push