We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent ca4fa32 commit d3bbb60Copy full SHA for d3bbb60
.github/workflows/release.yml
@@ -102,14 +102,16 @@ jobs:
102
draft: false
103
prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
104
105
- - name: ⏩ Merge stable with main, push main
+ - name: ⏩ Merge stable with main, push main
106
+ id: mergeMainline
107
+ continue-on-error: true
108
run: |
109
git checkout main
110
git merge -S stable
111
git push origin main
112
113
- name: ⏭ Create pull request from stable to main when direct merge fails
- if: ${{ failure() }}
114
+ if: steps.mergeMainline.outcome == 'failure'
115
uses: thomaseizinger/create-pull-request@1.0.0
116
env:
117
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
0 commit comments