From 2daf42e9814f214354c3aa202277453f74879039 Mon Sep 17 00:00:00 2001
From: Chris Penner <christopher.penner@gmail.com>
Date: Tue, 27 Feb 2024 09:50:41 -0800
Subject: [PATCH 1/2] Ensure we tag latest trunk for releases

---
 scripts/make-release.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/make-release.sh b/scripts/make-release.sh
index a8cba3b7aa..91ae1868f2 100755
--- a/scripts/make-release.sh
+++ b/scripts/make-release.sh
@@ -46,6 +46,8 @@ echo "Creating release in unison-local-ui..."
 gh release create "release/${version}" --repo unisonweb/unison-local-ui --target main --generate-notes --notes-start-tag "release/${prev_version}"
 
 echo "Kicking off release workflow in unisonweb/unison"
+# Make sure our local trunk is up to date, since that's usually what gets tagged.
+git fetch origin trunk:trunk
 git tag "${tag}" "${target}"
 git push origin "${tag}"
 gh workflow run release --repo unisonweb/unison --field "version=${version}"

From e5b78ed0d2989cdd53be527727608619a5b37d63 Mon Sep 17 00:00:00 2001
From: Chris Penner <christopher.penner@gmail.com>
Date: Tue, 27 Feb 2024 09:56:32 -0800
Subject: [PATCH 2/2] Use origin/trunk as release target

---
 scripts/make-release.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/make-release.sh b/scripts/make-release.sh
index 91ae1868f2..09ce5aa1cb 100755
--- a/scripts/make-release.sh
+++ b/scripts/make-release.sh
@@ -13,7 +13,7 @@ usage() {
     echo "NOTE: must be run from the root of the project."
     echo "Usage: $0 VERSION [TARGET]"
     echo "VERSION: The version you're releasing, e.g. M4a"
-    echo "TARGET: The revision to make the release from, defaults to 'trunk'"
+    echo "TARGET: The revision to make the release from, defaults to 'origin/trunk'"
     echo ""
     echo "E.g."
     echo "$0 M4a"
@@ -39,15 +39,15 @@ fi
 
 version="${1}"
 prev_version=$("${script_dir}/previous-tag.sh" "$version")
-target=${2:-trunk}
+target=${2:-origin/trunk}
 tag="release/${version}"
 
 echo "Creating release in unison-local-ui..."
 gh release create "release/${version}" --repo unisonweb/unison-local-ui --target main --generate-notes --notes-start-tag "release/${prev_version}"
 
 echo "Kicking off release workflow in unisonweb/unison"
-# Make sure our local trunk is up to date, since that's usually what gets tagged.
-git fetch origin trunk:trunk
+# Make sure our origin/trunk ref is up to date, since that's usually what gets tagged.
+git fetch origin trunk
 git tag "${tag}" "${target}"
 git push origin "${tag}"
 gh workflow run release --repo unisonweb/unison --field "version=${version}"