From fc4281d9439731953cceb17d60d285b22f8a63c9 Mon Sep 17 00:00:00 2001
From: Matthew Rathbone <matthew.rathbone@gmail.com>
Date: Wed, 20 Nov 2024 14:00:45 -0600
Subject: [PATCH] make release sh

---
 bin/make-release.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/bin/make-release.sh b/bin/make-release.sh
index 014d47fe0..d93b0e1f1 100755
--- a/bin/make-release.sh
+++ b/bin/make-release.sh
@@ -1,26 +1,31 @@
 #!/bin/bash
 
-set -euxo pipefail
+set -euo pipefail
 
 # Function to list the 5 most recent tags
 list_recent_tags() {
-  echo "Fetching the 5 most recent tags:"
-  git fetch --tags
-  git tag --sort=-v:refname | head -n 5
+  echo "Fetching the 5 most recent remote tags by date:"
+git ls-remote --tags origin | \
+  awk '{print $2}' | \
+  grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+(-[a-z]+\.[0-9]+)?$' | \
+  sort -V | tail -n 5
 }
 
 # Function to validate version format
 validate_version() {
-  if [[ "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    CHANNEL="none"
-  elif [[ "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+-(alpha|beta)\.[0-9]+$ ]]; then
-    CHANNEL="${BASH_REMATCH[2]}"
+  if [[ "$1" =~ ^([0-9]+\.[0-9]+\.[0-9]+)(-(alpha|beta)\.[0-9]+)?$ ]]; then
+    FULL_VERSION="${BASH_REMATCH[0]}"     # The full version string
+    MAIN_VERSION="${BASH_REMATCH[1]}"    # The main version (e.g., 5.0.0)
+    CHANNEL="${BASH_REMATCH[3]:-stable}" # Channel (alpha, beta, or stable)
+
+    echo "Full Version: $FULL_VERSION"
+    echo "Main Version: $MAIN_VERSION"
+    echo "Channel: $CHANNEL"
   else
-    echo "Error: Invalid version format. Expected x.x.x or x.x.x-alpha.x or x.x.x-beta.x"
+    echo "Error: Invalid version format. Expected x.x.x or x.x.x-channel.x"
     exit 1
   fi
 }
-
 # Step 1: List recent tags
 list_recent_tags