From 9c6f5d8c0106d9dba7fb61b7d6e8e5a10c8eb9c4 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Tue, 27 Aug 2024 10:59:35 +0200
Subject: [PATCH 1/2] Scripts, Release: Fix [gitlab_release] regexp

---
 scripts/ci/octez-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh
index ff1ed1400d4d..2c52cb7f8b53 100755
--- a/scripts/ci/octez-release.sh
+++ b/scripts/ci/octez-release.sh
@@ -20,7 +20,7 @@ octez_source_content="$script_inputs_dir/octez-source-content"
 
 # Full octez release tag
 # octez-vX.Y, octez-vX.Y-rcZ or octez-vX.Y-betaZ
-gitlab_release=$(echo "${CI_COMMIT_TAG}" | grep -oE '^octez-v([0-9]+)\.([0-9]+)$' || :)
+gitlab_release=$(echo "${CI_COMMIT_TAG}" | grep -oE '^octez-v([0-9]+)\.([0-9]+)(-(rc|beta)([0-9]+))?$' || :)
 
 # Strips the leading 'octez-v'
 # X.Y, X.Y-rcZ or X.Y-betaZ
-- 
GitLab


From 4e5971a528fb41a0a2560ef4c43af7fcf8bb64e0 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Wed, 28 Aug 2024 11:29:52 +0200
Subject: [PATCH 2/2] Packaging, RPM: Fix versions

---
 scripts/rpm/make_rpm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/rpm/make_rpm.sh b/scripts/rpm/make_rpm.sh
index 1d218612c2ec..c115d7b0179c 100755
--- a/scripts/rpm/make_rpm.sh
+++ b/scripts/rpm/make_rpm.sh
@@ -50,7 +50,7 @@ for specfile in "$myhome"/*spec.in; do
   #
   rpm_name=${OCTEZ_PKGNAME}-${pg}
   init_name=${OCTEZ_REALNAME}-${pg}
-  rpm_vers=$(echo "${pkg_vers}" | tr -d '~')
+  rpm_vers=$(echo "${pkg_vers}" | tr -d '~' | tr '-' '_')
   rpm_fullname="${rpm_name}-${rpm_vers}-${OCTEZ_PKGREV}.${rpm_arch}.rpm"
 
   binaries=$(fixBinaryList "${common}/${pg}-binaries")
-- 
GitLab