From 08f5e83577d2682cb34301207d176598550429f0 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 22 May 2025 09:37:52 +1000
Subject: [PATCH] correct versions.json milestone

---
 update.sh     | 2 +-
 versions.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/update.sh b/update.sh
index 55e3971..b6d8778 100755
--- a/update.sh
+++ b/update.sh
@@ -155,7 +155,7 @@ update_version()
 	fi
 	# Add version to versions.json
 	versionJson="$(jq -e \
-		--arg milestone "${version}" --arg milestoneversion "${version}${ubi}" --arg version "$mariaVersion" --arg fullVersion "$fullVersion" --arg releaseStatus "$releaseStatus" --arg supportType "$supportType" --arg base "$base" --arg arches "${arches# }" \
+		--arg milestone "${version%%-*}" --arg milestoneversion "${version}${ubi}" --arg version "$mariaVersion" --arg fullVersion "$fullVersion" --arg releaseStatus "$releaseStatus" --arg supportType "$supportType" --arg base "$base" --arg arches "${arches# }" \
 		'.[$milestoneversion] = {"milestone": $milestone, "version": $version, "fullVersion": $fullVersion, "releaseStatus": $releaseStatus, "supportType": $supportType, "base": $base, "arches": $arches|split(" ")}' versions.json)"
 	printf '%s\n' "$versionJson" > versions.json
 }
diff --git a/versions.json b/versions.json
index 88778f2..fe81393 100644
--- a/versions.json
+++ b/versions.json
@@ -140,7 +140,7 @@
     ]
   },
   "10.6-jammy": {
-    "milestone": "10.6-jammy",
+    "milestone": "10.6",
     "version": "10.6.22",
     "fullVersion": "1:10.6.22+maria~ubu2204",
     "releaseStatus": "Stable",