Skip to content

Commit a899db4

Browse files
authored
Update release.yml
1 parent e6f09cc commit a899db4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,15 @@ jobs:
116116
prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
117117

118118
- name: ⏩ Merge stable with main, push to origin
119+
id: mergeMainline
120+
continue-on-error: true
119121
run: |
120122
git checkout main
121123
git merge -S stable
122124
git push origin main
123125
124126
- name: ⏭ Create pull request from stable to main when direct merge fails
125-
if: ${{ failure() }}
127+
if: steps.mergeMainline.outcome == 'failure'
126128
uses: thomaseizinger/create-pull-request@1.0.0
127129
env:
128130
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}

0 commit comments

Comments
 (0)