Update release_pr.yml

vinmassaro · Jan 30, 2024 · 5eb018c · 5eb018c
1 parent 5404674
commit 5eb018c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/.github/workflows/release_pr.yml b/.github/workflows/release_pr.yml
@@ -28,16 +28,15 @@ jobs:
       run: |
         git config user.name github-actions
         git config user.email [email protected]
-        git branch develop origin/develop
-        git merge develop --no-edit -X theirs
-        git status
 
     - name: Get next release number
       run: |
+        git branch develop origin/develop
+        git merge develop --no-edit -X theirs
         git status
         npm install --force
-        npx --no-install semantic-release --no-ci --dry-run --branch master
-        next_version=$(npx --no-install semantic-release --no-ci --dry-run --branch master 2>/dev/null | sed -nE 's/.*the next release version is ([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')
+        npx --no-install semantic-release --no-ci --dry-run --branches master
+        next_version=$(npx --no-install semantic-release --no-ci --dry-run --branches master 2>/dev/null | sed -nE 's/.*the next release version is ([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')
         echo release_branch="rel-${next_version//.}" >> "$GITHUB_ENV"
 
     - name: Create release branch