Fix branch name in actions

This commit is contained in:
2026-09-18 14:34:43 +02:00
parent a97420c356
commit 921a7deffb
101 changed files with 4927 additions and 20 deletions
+3 -3
View File
@@ -25,10 +25,10 @@ jobs:
run: |
git remote add upstream https://gitea.labus.uk/upstream-mirrors/quik.git
git fetch upstream
# Try to merge upstream main into our main branch.
# Try to merge upstream master into our master branch.
# If it fails, the step exits with a non-zero code.
git merge upstream/main --no-edit
git push origin main
git merge upstream/master --no-edit
git push origin master
- name: Notify on Failure
if: failure()