From c3f36ab0a4ec1ac931ecbc0634902801ac01c47e Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Wed, 12 Jul 2023 15:45:06 +0000
Subject: [PATCH] ci(scripts): add support for `--force` in `release.sh`

---
 scripts/release.sh             | 20 ++++++++++++++++----
 scripts/release/tag_version.sh | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index 278e06468024d..b2feecedd4910 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -7,7 +7,7 @@ cdroot
 
 usage() {
 	cat <<EOH
-Usage: ./release.sh [--dry-run] [-h | --help] [--ref <ref>] [--major | --minor | --patch]
+Usage: ./release.sh [--dry-run] [-h | --help] [--ref <ref>] [--major | --minor | --patch] [--force]
 
 This script should be called to create a new release.
 
@@ -33,6 +33,9 @@ Flags:
 Set --major or --minor to force a larger version bump, even when there are no
 breaking changes. By default a patch version will be created, --patch is no-op.
 
+Set --force force the provided increment to be used (e.g. --patch), even if
+there are breaking changes, etc.
+
 Set --ref if you need to specify a specific commit that the new version will
 be tagged at, otherwise the latest commit will be used.
 
@@ -44,8 +47,9 @@ branch=main
 dry_run=0
 ref=
 increment=
+force=0
 
-args="$(getopt -o h -l dry-run,help,ref:,major,minor,patch -- "$@")"
+args="$(getopt -o h -l dry-run,help,ref:,major,minor,patch,force -- "$@")"
 eval set -- "$args"
 while true; do
 	case "$1" in
@@ -68,6 +72,10 @@ while true; do
 		increment=${1#--}
 		shift
 		;;
+	--force)
+		force=1
+		shift
+		;;
 	--)
 		shift
 		break
@@ -112,8 +120,12 @@ trap 'log "Check commit metadata failed, you can try to set \"export CODER_IGNOR
 source "$SCRIPT_DIR/release/check_commit_metadata.sh" "$old_version" "$ref"
 trap - EXIT
 
+tag_version_args=(--old-version "$old_version" --ref "$ref" --"$increment")
+if ((force == 1)); then
+	tag_version_args+=(--force)
+fi
 log "Executing DRYRUN of release tagging..."
-new_version="$(execrelative ./release/tag_version.sh --old-version "$old_version" --ref "$ref" --"$increment" --dry-run)"
+new_version="$(execrelative ./release/tag_version.sh "${tag_version_args[@]}" --dry-run)"
 log
 read -p "Continue? (y/n) " -n 1 -r continue_release
 log
@@ -139,7 +151,7 @@ fi
 log
 # Run without dry-run to actually create the tag, note we don't update the
 # new_version variable here to ensure we're pushing what we showed before.
-maybedryrun "$dry_run" execrelative ./release/tag_version.sh --old-version "$old_version" --ref "$ref" --"$increment" >/dev/null
+maybedryrun "$dry_run" execrelative ./release/tag_version.sh "${tag_version_args[@]}" >/dev/null
 maybedryrun "$dry_run" git push --tags -u origin "$new_version"
 
 if ((dry_run)); then
diff --git a/scripts/release/tag_version.sh b/scripts/release/tag_version.sh
index 3ca4e659f9c6b..c305c8d218359 100755
--- a/scripts/release/tag_version.sh
+++ b/scripts/release/tag_version.sh
@@ -26,8 +26,9 @@ dry_run=0
 old_version=
 ref=HEAD
 increment=
+force=0
 
-args="$(getopt -o h -l dry-run,help,old-version:,ref:,major,minor,patch -- "$@")"
+args="$(getopt -o h -l dry-run,help,old-version:,ref:,major,minor,patch,force -- "$@")"
 eval set -- "$args"
 while true; do
 	case "$1" in
@@ -54,6 +55,10 @@ while true; do
 		increment=${1#--}
 		shift
 		;;
+	--force)
+		force=1
+		shift
+		;;
 	--)
 		shift
 		break
@@ -90,7 +95,12 @@ if ((COMMIT_METADATA_BREAKING == 1)); then
 		increment=minor
 	fi
 	if [[ $prev_increment != "$increment" ]]; then
-		log "Breaking change detected, changing version increment from \"$prev_increment\" to \"$increment\"."
+		if ((force == 1)); then
+			log "Breaking change detected but --force provided, would use \"$increment\" but keeping \"$prev_increment\"."
+			increment=$prev_increment
+		else
+			log "Breaking change detected, changing version increment from \"$prev_increment\" to \"$increment\"."
+		fi
 	else
 		log "Breaking change detected, provided increment is sufficient, using \"$increment\" increment."
 	fi