From e202cfb3eb0ee93530788cf06153045ffa1b3de4 Mon Sep 17 00:00:00 2001
From: Mikita Hradovich <mikita.hradovich@scylladb.com>
Date: Wed, 1 Apr 2026 15:29:46 +0200
Subject: [PATCH] feat: add release-version and development-version overrides
 to release workflow

---
 .github/workflows/release.yml |  7 +++++++
 Makefile                      | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5c6001..6b8ce14 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,6 +18,11 @@ on:
         description: 'target-tag: tag or branch name to release. Use to re-release failed releases'
         default: master
 
+      release-version:
+        type: string
+        description: 'release-version: version to release (e.g. 0.14.0.0). Defaults to current SNAPSHOT version without the -SNAPSHOT suffix.'
+        default: ''
+
 jobs:
   release:
     name: Release
@@ -69,6 +74,8 @@ jobs:
       - name: Prepare release
         env:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          SKIP_TESTS: ${{ inputs.skip-tests }}
+          RELEASE_VERSION: ${{ inputs.release-version }}
         run: |
           make release-prepare
 
diff --git a/Makefile b/Makefile
index b57c363..1854363 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ DRY_RUN ?= true
 SKIP_TESTS ?= false
 GITHUB_STEP_SUMMARY ?=
 
+RELEASE_VERSION ?=
+
 #ifeq ($(shell if [[ -n "$${GITHUB_STEP_SUMMARY}" ]]; then echo "running-in-workflow"; else echo "running-in-shell"; fi), running-in-workflow)
 #	DEBUG = true
 #endif
@@ -22,6 +24,11 @@ ifneq (${SKIP_TESTS},false)
 	_RELEASE_SKIP_TESTS= -DskipTests=true -DskipITs=true
 endif
 
+_RELEASE_VERSION_FLAG ?=
+ifneq (${RELEASE_VERSION},)
+	_RELEASE_VERSION_FLAG= -DreleaseVersion=${RELEASE_VERSION}
+endif
+
 ifeq (${DEBUG},false)
 	MVNCMD ?= mvn
 else
@@ -47,7 +54,8 @@ ifeq ($(shell if [[ -n "$${GPG_PASSPHRASE}" ]]; then echo "present"; else echo "
 	@echo "environment variable GPG_PASSPHRASE has to be set"
 	@exit 1
 endif
-	MAVEN_OPTS="$${MAVEN_OPTS}$(_RELEASE_SKIP_TESTS)" $(MVNCMD) release:prepare -Drelease.push.changes=false -Dgpg.passphrase=$${GPG_PASSPHRASE}
+	MAVEN_OPTS="$${MAVEN_OPTS}$(_RELEASE_SKIP_TESTS)" $(MVNCMD) release:prepare -Drelease.push.changes=false \
+		-Dgpg.passphrase="$${GPG_PASSPHRASE}" $(_RELEASE_VERSION_FLAG)
 
 .release:
 ifeq ($(shell if [[ -n "$${GPG_PASSPHRASE}" ]]; then echo "present"; else echo "absent"; fi), absent)