From e332b23d4ec443601f3fd7bac9487699ea80d80a Mon Sep 17 00:00:00 2001
From: Ben <me@bpmct.net>
Date: Tue, 18 Jul 2023 17:57:03 +0000
Subject: [PATCH 1/2] chore: fix release notes compare link

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

diff --git a/scripts/release/generate_release_notes.sh b/scripts/release/generate_release_notes.sh
index cb2f37bb09981..66907acc9d198 100755
--- a/scripts/release/generate_release_notes.sh
+++ b/scripts/release/generate_release_notes.sh
@@ -149,7 +149,7 @@ image_tag="$(execrelative ../image_tag.sh --version "$new_version")"
 echo -e "## Changelog
 $changelog
 
-Compare: [\`$old_version...$new_version\`](https://github.com/coder/coder/compare/$old_version...$new_version)
+Compare: [\`$old_version...v$new_version\`](https://github.com/coder/coder/compare/$old_version...v$new_version)
 
 ## Container image
 

From 0bbc6d44b59dfd81efb799835c16d3b84c649d27 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Wed, 19 Jul 2023 09:00:36 +0000
Subject: [PATCH 2/2] fix new version passed to release notes in release.yaml

---
 .github/workflows/release.yaml            | 2 +-
 scripts/release/generate_release_notes.sh | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index f2ec780e212d4..84019df220666 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -76,7 +76,7 @@ jobs:
           set -euo pipefail
           ref=HEAD
           old_version="$(git describe --abbrev=0 "$ref^1")"
-          version="$(./scripts/version.sh)"
+          version="v$(./scripts/version.sh)"
 
           # Generate notes.
           release_notes_file="$(mktemp -t release_notes.XXXXXX)"
diff --git a/scripts/release/generate_release_notes.sh b/scripts/release/generate_release_notes.sh
index 66907acc9d198..aea595459d66a 100755
--- a/scripts/release/generate_release_notes.sh
+++ b/scripts/release/generate_release_notes.sh
@@ -54,6 +54,9 @@ fi
 if [[ -z $new_version ]]; then
 	error "No new version specified"
 fi
+if [[ $new_version != v* ]]; then
+	error "New version must start with a v"
+fi
 if [[ -z $ref ]]; then
 	error "No ref specified"
 fi
@@ -149,7 +152,7 @@ image_tag="$(execrelative ../image_tag.sh --version "$new_version")"
 echo -e "## Changelog
 $changelog
 
-Compare: [\`$old_version...v$new_version\`](https://github.com/coder/coder/compare/$old_version...v$new_version)
+Compare: [\`$old_version...$new_version\`](https://github.com/coder/coder/compare/$old_version...$new_version)
 
 ## Container image