ci: finish adapting scripts

Author: RobPasMue

.github/workflows/autorelease.yml

@@ -32,40 +32,13 @@ jobs:
           git config --global user.name ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
           git config --global user.email ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
 
-      # Retrieve the latest release tag from GitHub
-      - name: Get Latest Release Branch (only for patch releases)
-        if: ${{ inputs.release_type == 'patch' }}
-        id: get-release
-        run: |
-          # Fetch all tags
-          git fetch --tags
-
-          # Get the latest release tag
-          LATEST_RELEASE=$(git tag --list "v*" --sort=-version:refname | head -n 1)
-
-          # Parse major and minor version numbers
-          if [[ "$LATEST_RELEASE" =~ ^v([0-9]+)\.([0-9]+)\.[0-9]+$ ]]; then
-            MAJOR="${BASH_REMATCH[1]}"
-            MINOR="${BASH_REMATCH[2]}"
-            RELEASE_BRANCH="release/${MAJOR}.${MINOR}"
-            echo "Latest release tag: $LATEST_RELEASE"
-            echo "Associated release branch: $RELEASE_BRANCH"
-          else
-            echo "Error: Unable to parse the latest release tag."
-            exit 1
-          fi
-
-          # Export the release branch name
-          echo "RELEASE_BRANCH=${RELEASE_BRANCH}" >> $GITHUB_ENV
-
       # Run the patch release script
       - name: Run Patch Release Script
         if: ${{ inputs.release_type == 'patch' }}
         env:
           GITHUB_TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
-          RELEASE_BRANCH: ${{ env.RELEASE_BRANCH }}
         run: |
-          ./scripts/patch_release.sh ${{ env.RELEASE_BRANCH }}
+          ./scripts/patch_release.sh
 
       # Run the major/minor release script
       - name: Run Major/Minor Release Script

scripts/major_minor_release.sh

@@ -43,14 +43,14 @@ if [ "$BUMP_TYPE" == "major" ]; then
     # New dev VERSION file:       1.1.dev0
     NEW_RELEASE_VERSION="$((MAJOR + 1)).0.0"
     NEW_DEV_VERSION="$((MAJOR + 1)).1.dev0"
-    NEW_RELEASE_BRANCH="release/v$((MAJOR + 1)).0"
+    NEW_RELEASE_BRANCH="release/$((MAJOR + 1)).0"
 elif [ "$BUMP_TYPE" == "minor" ]; then
     # VERSION file on main:       0.2.dev0
     # New release VERSION file:   0.2.0
     # New dev VERSION file:       0.3.dev0
     NEW_RELEASE_VERSION="$MAJOR.$MINOR.0"
     NEW_DEV_VERSION="$MAJOR.$((MINOR + 1)).dev0"
-    NEW_RELEASE_BRANCH="release/v$MAJOR.$MINOR"
+    NEW_RELEASE_BRANCH="release/$MAJOR.$MINOR"
 fi
 
 # Create the release branch and bump the release version

scripts/patch_release.sh

@@ -3,21 +3,30 @@
 # Ensure the script exits if any command fails
 set -e
 
-# Check if two arguments are passed
-if [ "$#" -ne 1 ]; then
-    echo "Usage: $0 <release-branch-name>"
-    exit 1
-fi
-
-# Assign arguments to variables
-RELEASE_BRANCH=$1
-
 # Checkout main branch
 git checkout main
 
 # Pull the latest changes
 git pull
 
+# Fetch all tags
+git fetch --tags
+
+# Get the latest release tag
+LATEST_RELEASE=$(git tag --list "v*" --sort=-version:refname | head -n 1)
+
+# Parse major and minor version numbers
+if [[ "$LATEST_RELEASE" =~ ^v([0-9]+)\.([0-9]+)\.[0-9]+$ ]]; then
+  MAJOR="${BASH_REMATCH[1]}"
+  MINOR="${BASH_REMATCH[2]}"
+  RELEASE_BRANCH="release/${MAJOR}.${MINOR}"
+  echo "Latest release tag: $LATEST_RELEASE"
+  echo "Associated release branch: $RELEASE_BRANCH"
+else
+  echo "Error: Unable to parse the latest release tag."
+  exit 1
+fi
+
 # Checkout release branch
 git checkout $RELEASE_BRANCH