We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent e6f09cc commit a899db4Copy full SHA for a899db4
.github/workflows/release.yml
@@ -116,13 +116,15 @@ jobs:
116
prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
117
118
- name: ⏩ Merge stable with main, push to origin
119
+ id: mergeMainline
120
+ continue-on-error: true
121
run: |
122
git checkout main
123
git merge -S stable
124
git push origin main
125
126
- name: ⏭ Create pull request from stable to main when direct merge fails
- if: ${{ failure() }}
127
+ if: steps.mergeMainline.outcome == 'failure'
128
uses: thomaseizinger/create-pull-request@1.0.0
129
env:
130
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
0 commit comments