Update release_pr.yml

vinmassaro · Feb 21, 2024 · 3f8d94c · 3f8d94c
1 parent 0326d96
commit 3f8d94c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/release_pr.yml b/.github/workflows/release_pr.yml
@@ -69,7 +69,7 @@ jobs:
     if: ${{ github.event.action != 'synchronize' && github.event.action != 'closed' }}
     outputs:
       NEXT_VERSION: ${{ steps.get_release_number.outputs.next_version }}
-      RELEASE_BRANCH: ${{ steps.get_release_number.outputs.next_version }}
+      RELEASE_BRANCH: ${{ steps.get_release_number.outputs.release_branch }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -117,7 +117,7 @@ jobs:
     - name: Create release branch
       if: ${{ github.event.number == '' }}
       env:
-        RELEASE_BRANCH: ${{ vars.RELEASE_BRANCH }}
+        RELEASE_BRANCH: ${{ steps.get_release_number.outputs.release_branch }}
       run: |
         echo "The release branch is: $RELEASE_BRANCH" 
         git checkout -b "$RELEASE_BRANCH"
@@ -129,7 +129,7 @@ jobs:
     outputs:
       PR_NUMBER: ${{ steps.create_pull_request.outputs.PR_NUMBER }}
     env:
-      RELEASE_BRANCH: ${{ needs.get_next_release_version.outputs.RELEASE_BRANCH }} || ${{ vars.RELEASE_BRANCH }}
+      RELEASE_BRANCH: ${{ needs.get_next_release_version.outputs.RELEASE_BRANCH || vars.RELEASE_BRANCH }}
       NEXT_VERSION: ${{ needs.get_next_release_version.outputs.NEXT_VERSION }}
     runs-on: ubuntu-latest
     steps:
@@ -145,7 +145,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ always() && github.event.action != 'closed' }}
     env:
-      RELEASE_BRANCH: ${{ needs.get_next_release_version.outputs.RELEASE_BRANCH }} || ${{ vars.RELEASE_BRANCH }}
+      RELEASE_BRANCH: ${{ needs.get_next_release_version.outputs.RELEASE_BRANCH || vars.RELEASE_BRANCH }}
       PR_NUMBER: ${{ needs.create_pull_request.outputs.PR_NUMBER }}
       RELEASE_SITES_DEPLOYED: ${{ vars.RELEASE_SITES_DEPLOYED }}
     steps: