Skip to content

Commit 8f01058

Browse files
authored
Update release.yml
1 parent cdffb5a commit 8f01058

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ jobs:
111111
git merge --no-commit --no-ff stable > /dev/null ; if [ $? -eq 0 ] ; then echo "CAN_MERGE=true" >> $GITHUB_ENV ; else echo "CAN_MERGE=false" >> $GITHUB_ENV ; fi
112112
113113
- name: ⏩ Merge stable with main, push main
114-
if: ${{ success() }}
114+
if: ${{ env.CAN_MERGE == true }}
115115
run: |
116116
git merge --abort
117117
git merge -S stable
118118
git push origin main
119119
120120
- name: ⏭ Create pull request from stable to main
121-
if: ${{ failure() }}
121+
if: ${{ env.CAN_MERGE == false }}
122122
uses: thomaseizinger/[email protected]
123123
env:
124124
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)