From d8ff162494aa4de87e0897c45362cc644d20b46d Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Tue, 11 Feb 2025 09:10:41 -0500
Subject: [PATCH] Fix ESR check to check for a newer remote branch instead of
 an increment (#3314)

* Fix ESR check to check for a newer remote branch instead of an increment

* Fix for major version
---
 scripts/patch_updater_yml.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/patch_updater_yml.sh b/scripts/patch_updater_yml.sh
index e1607e35..8186afbd 100755
--- a/scripts/patch_updater_yml.sh
+++ b/scripts/patch_updater_yml.sh
@@ -2,7 +2,7 @@
 set -e
 
 VERSION="$(jq -r '.version' <package.json)"
-STABLE_VERSION="$(./node_modules/.bin/semver $VERSION -c)"
+STABLE_VERSION="$(npx semver $VERSION -c)"
 RELEASE_VERSION="${VERSION/$STABLE_VERSION/}"
 RELEASE_VERSION="${RELEASE_VERSION/-/}"
 RELEASE_VERSION="${RELEASE_VERSION%.*}"
@@ -11,8 +11,11 @@ if [ "$RELEASE_VERSION" == "" ]; then
     RELEASE_VERSION="latest"
 fi
 
-# If we are on a ESR branch, we don't want to generate the auto-updater yml for patch releases
-if [ -e .esr ] && [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[1-9][0-9]* ]]; then
+# If we are on a ESR branch, we don't want to generate the auto-updater yml if there is a newer version
+NEXT_MINOR_VERSION="$(npx semver $STABLE_VERSION -i minor)"
+NEXT_MAJOR_VERSION="$(npx semver $STABLE_VERSION -i major)"
+NEWER_VERSION_EXISTS="$(git ls-remote --tags origin v${NEXT_MINOR_VERSION} v${NEXT_MAJOR_VERSION})"
+if [ -e .esr ] && [ ! -z "$NEWER_VERSION_EXISTS" ]; then
     echo "ESR branch, skipping auto-updater yml generation"
     rm ./release/"${RELEASE_VERSION}"*.yml
     exit 0