Merge branch 'main' into feat/trezor-erc721-e2e

Author: dawnseeker8

.github/scripts/get-next-semver-version.sh

@@ -9,7 +9,16 @@ then
   exit 0
 fi
 
-# Get the version from package.json
-VERSION_PACKAGE=$(node -p "require(process.env.GITHUB_WORKSPACE + '/package.json').version")
+# Pattern for Version-vX.Y.Z branches
+VERSION_BRANCHES_VERSION_V=$(git branch -r | grep -o 'Version-v[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
+# Default pattern for release/x.y.z branches
+VERSION_BRANCHES_RELEASE=$(git branch -r | grep -o 'release/[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
 
-echo "NEXT_SEMVER_VERSION=${VERSION_PACKAGE}" >> "$GITHUB_ENV"
+# Compare versions and keep the highest one
+HIGHEST_VERSION=$(printf "%s\n%s" "$VERSION_BRANCHES_VERSION_V" "$VERSION_BRANCHES_RELEASE" | sort --version-sort | tail -n 1)
+echo "HIGHEST_VERSION=${HIGHEST_VERSION}, VERSION_BRANCHES_VERSION_V=${VERSION_BRANCHES_VERSION_V}, VERSION_BRANCHES_RELEASE=${VERSION_BRANCHES_RELEASE}"
+
+# Increment the minor version of the highest version found and reset the patch version to 0
+NEXT_VERSION=$(echo "$HIGHEST_VERSION" | awk -F. -v OFS=. '{$2++; $3=0; print}')
+
+echo "NEXT_SEMVER_VERSION=${NEXT_VERSION}" >> "$GITHUB_ENV"

.github/workflows/add-release-label.yml

@@ -24,7 +24,8 @@ jobs:
         id: get-next-semver-version
         env:
           FORCE_NEXT_SEMVER_VERSION: ${{ vars.FORCE_NEXT_SEMVER_VERSION }}
-        run: ./development/get-next-semver-version.sh "$FORCE_NEXT_SEMVER_VERSION"
+        run: ./get-next-semver-version.sh "$FORCE_NEXT_SEMVER_VERSION"
+        working-directory: '.github/scripts'
 
       - name: Add release label to PR and linked issues
         id: add-release-label-to-pr-and-linked-issues

.github/workflows/create-release-pr.yml

@@ -13,20 +13,20 @@ on:
         description: 'A semantic version, eg: x.x.x'
         required: true
       previous-version-ref:
-        description: 'Previous release version reference (tag or commit hash). eg: v7.7.0'
+        description: 'Previous release version branch name, tag or commit hash (e.g., Version-vx.y.z, v7.7.0, or 76fbc500034db9779e9ff7ce637ac5be1da0493d)'
         required: true
 
 jobs:
   create-release-pr:
     name: Create Release Pull Request using Github Tools
-    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@75cfa5085bee4804dadaa2516a47c4ff37278b35
+    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@d15d78647c5493e12cc55717504fbf10aabd05a9
     with:
       platform: extension
       checkout-base-branch: ${{ inputs.checkout-base-branch }}
       release-pr-base-branch: ${{ inputs.release-pr-base-branch }}
       semver-version: ${{ inputs.semver-version }}
-      previous-version-tag: ${{ inputs.previous-version-ref }}
-      github-tools-version: 75cfa5085bee4804dadaa2516a47c4ff37278b35
+      previous-version-ref: ${{ inputs.previous-version-ref }}
+      github-tools-version: d15d78647c5493e12cc55717504fbf10aabd05a9
     secrets:
       # This token needs write permissions to metamask-extension & read permissions to metamask-planning
       github-token: ${{ secrets.PR_TOKEN }}