From 87ed6ab9bb177ee4da7a57548a6db3aa0bca0b2d Mon Sep 17 00:00:00 2001
From: Anthony Ramine <aramine@cloudflare.com>
Date: Tue, 9 Apr 2024 11:05:23 +0200
Subject: [PATCH] Tweak cliff config to exclude merge and release commits from
 changelog

---
 cliff.toml              | 4 +++-
 hyper-boring/Cargo.toml | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cliff.toml b/cliff.toml
index fb3c241d..66a04d52 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -17,7 +17,9 @@ footer = ""
 [git]
 conventional_commits = false
 commit_parsers = [
-  { message = "^Pull request", skip = true }
+  { message = "^Merge", skip = true },
+  { message = "^Pull request", skip = true },
+  { message = "^Release", skip = true },
 ]
 filter_commits = false
 tag_pattern = "[v0-9]*"
diff --git a/hyper-boring/Cargo.toml b/hyper-boring/Cargo.toml
index cd9991e6..5a516b9f 100644
--- a/hyper-boring/Cargo.toml
+++ b/hyper-boring/Cargo.toml
@@ -44,3 +44,11 @@ hyper = { workspace = true, features = [ "full" ] }
 tokio = { workspace = true, features = [ "full" ] }
 tower = { workspace = true, features = ["util"] }
 futures = { workspace = true }
+
+[package.metadata.release]
+pre-release-hook = [
+  "git-cliff",
+  "--workdir", "..",
+  "-o", "../RELEASE_NOTES",
+  "--tag", "{{version}}"
+]