From 7a55f50adf20001cc81d36351fed556b3a32ae5f Mon Sep 17 00:00:00 2001
From: Gwilym Kuiper <email@gwilym.dev>
Date: Sun, 2 Oct 2022 18:19:14 +0100
Subject: [PATCH] Extract changelog text into the annotation

---
 justfile             |  2 +-
 tools/src/release.rs | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/justfile b/justfile
index 575f9c3a..201ced58 100644
--- a/justfile
+++ b/justfile
@@ -72,7 +72,7 @@ release +args: (_run-tool "release" args)
 
 _run-tool +tool:
     (cd tools && cargo build)
-    tools/target/debug/tools {{tool}}
+    "$CARGO_TARGET_DIR/debug/tools" {{tool}}
 
 _build-rom folder name:
     #!/usr/bin/env bash
diff --git a/tools/src/release.rs b/tools/src/release.rs
index a6f82c6b..f8671db4 100644
--- a/tools/src/release.rs
+++ b/tools/src/release.rs
@@ -69,16 +69,16 @@ pub fn release(matches: &clap::ArgMatches) -> Result<(), Error> {
             .success());
     }
 
-    // assert!(Command::new("just")
-    //     .arg("ci")
-    //     .current_dir(&root_directory)
-    //     .status()
-    //     .map_err(|_| Error::JustCiFailed)?
-    //     .success());
+    assert!(Command::new("just")
+        .arg("ci")
+        .current_dir(&root_directory)
+        .status()
+        .map_err(|_| Error::JustCiFailed)?
+        .success());
 
     let changelog_text = update_changelog(&root_directory, version)?;
 
-    println!("Content of changelog:\n\n{changelog_text}");
+    println!("Content of changelog:\n{changelog_text}");
 
     if !dry_run {
         execute_git_command(
@@ -92,7 +92,7 @@ pub fn release(matches: &clap::ArgMatches) -> Result<(), Error> {
                 "-a",
                 &version.to_string(),
                 "-m",
-                &format!("v{version}"),
+                &format!("#v{version}\n{changelog_text}"),
             ],
         )?;
     }
@@ -184,9 +184,10 @@ fn update_changelog(root_directory: &Path, new_version: &Version) -> Result<Stri
         .find(UNRELEASED_HEADER)
         .ok_or(Error::FailedToParseChangelog)?
         + UNRELEASED_HEADER.len();
-    let unreleased_bit_end = changelog_content
+    let unreleased_bit_end = changelog_content[unreleased_bit_start..]
         .find("\n## [") // the start of the next entry
-        .ok_or(Error::FailedToParseChangelog)?;
+        .ok_or(Error::FailedToParseChangelog)?
+        + unreleased_bit_start;
 
     let change_content = changelog_content[unreleased_bit_start..unreleased_bit_end].to_owned();