Skip to content

Commit 6e26c9b

Browse files
authored
Update release.yml
1 parent 4e6e249 commit 6e26c9b

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,19 @@ jobs:
106106
prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
107107

108108
- name: ☑ Check if merge of stable to main is possible
109-
shell: bash
110-
continue-on-error: true
111109
run: |
112110
git checkout main
113111
git merge --no-commit --no-ff stable
114-
echo echo "CAN_MERGE_STABLE_WITH_MAIN=$($? == 0)" >> $GITHUB_ENV
115-
git merge --abort
116112
117113
- name: ⏩ Merge stable with main, push main
118-
if: ${{ env.CAN_MERGE_STABLE_WITH_MAIN == true }}
114+
if: ${{ success() }}
119115
run: |
120-
git checkout main
116+
git merge --abort
121117
git merge -S stable
122118
git push origin main
123119
124120
- name: ⏭ Create pull request from stable to main
125-
if: ${{ env.CAN_MERGE_STABLE_WITH_MAIN == false }}
121+
if: ${{ failure() }}
126122
uses: thomaseizinger/create-pull-request@1.0.0
127123
env:
128124
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)