Skip to content

Commit 129604f

Browse files
authored
Update release.yml
1 parent 09851dd commit 129604f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ jobs:
109109
continue-on-error: true
110110
run: |
111111
git checkout main
112-
git merge --no-commit --no-ff stable ; if [ $? -eq 0 ] ; then echo "CAN_MERGE=true" >> $GITHUB_ENV ; else echo "CAN_MERGE=false" >> $GITHUB_ENV ; fi
112+
git merge --no-commit --no-ff stable
113+
echo "CAN_MERGE=true" >> $GITHUB_ENV
113114
114115
- name: ⏩ Merge stable with main, push main
115116
if: ${{ env.CAN_MERGE == true }}
@@ -119,7 +120,7 @@ jobs:
119120
git push origin main
120121
121122
- name: ⏭ Create pull request from stable to main
122-
if: ${{ env.CAN_MERGE == false }}
123+
if: ${{ env.CAN_MERGE != true }}
123124
uses: thomaseizinger/[email protected]
124125
env:
125126
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)