From a899db455309948b15ddd198c99a527522730673 Mon Sep 17 00:00:00 2001
From: Egil Hansen <egil@assimilated.dk>
Date: Fri, 30 Apr 2021 11:17:18 +0000
Subject: [PATCH] Update release.yml

---
 .github/workflows/release.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 96c577980..fed5a8f5f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -116,13 +116,15 @@ jobs:
           prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
 
       - name: ⏩ Merge stable with main, push to origin
+        id: mergeMainline
+        continue-on-error: true      
         run: |
           git checkout main
           git merge -S stable
           git push origin main
 
       - name: ⏭ Create pull request from stable to main when direct merge fails
-        if: ${{ failure() }}
+        if: steps.mergeMainline.outcome == 'failure'
         uses: thomaseizinger/create-pull-request@1.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}