ci(release.yaml): remove if and allow 'merge into develop' step to fail

This commit is contained in:
2025-08-27 21:13:05 +02:00
parent e70cf13b27
commit 5d5b7d584c

View File

@@ -115,14 +115,11 @@ jobs:
rm release_body.md rm release_body.md
- name: 📤 merge into develop - name: 📤 merge into develop
continue-on-error: true
run: | run: |
if git show-ref --quiet refs/heads/develop; then git checkout develop
git checkout develop git merge main
git merge main git push origin develop
git push origin develop
else
echo "develop doesn't exist, skipping..."
fi
- name: ✅ done - name: ✅ done
run: echo "done" run: echo "done"