From 5d5b7d584c35cf6edfded12e118bac6f30cdad12 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Wed, 27 Aug 2025 21:13:05 +0200 Subject: [PATCH] ci(release.yaml): remove if and allow 'merge into develop' step to fail --- .github/workflows/release.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a3a4867..98d660f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -115,14 +115,11 @@ jobs: rm release_body.md - name: 📤 merge into develop + continue-on-error: true run: | - if git show-ref --quiet refs/heads/develop; then - git checkout develop - git merge main - git push origin develop - else - echo "develop doesn't exist, skipping..." - fi + git checkout develop + git merge main + git push origin develop - name: ✅ done run: echo "done"