Skip to content

Commit d3bbb60

Browse files
authored
Update release.yml
1 parent ca4fa32 commit d3bbb60

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ jobs:
102102
draft: false
103103
prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
104104

105-
- name: ⏩ Merge stable with main, push main
105+
- name: ⏩ Merge stable with main, push main
106+
id: mergeMainline
107+
continue-on-error: true
106108
run: |
107109
git checkout main
108110
git merge -S stable
109111
git push origin main
110112
111113
- name: ⏭ Create pull request from stable to main when direct merge fails
112-
if: ${{ failure() }}
114+
if: steps.mergeMainline.outcome == 'failure'
113115
uses: thomaseizinger/create-pull-request@1.0.0
114116
env:
115117
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}

0 commit comments

Comments
 (0)