From 10e12c26f1e8f7d043e13dfcff3e0555398983f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= <felix@passcod.name>
Date: Sun, 5 Nov 2023 00:11:29 +1300
Subject: [PATCH] Add to changelog

---
 CHANGELOG.md |  4 ++++
 bin/version  | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50f3b5c..58c5144 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next (YYYY-MM-DD)
 
+- Clarify why and in which situations `AsyncGroupChild::wait` may not behave as expected when cancelled.
+- Add `AsyncGroupChild::start_kill` to align with Tokio's `Child::start_kill`.
+- Change `AsyncGroupChild::kill` to also `wait()` on the child, to align with Tokio's `Child::kill`.
+
 ## v3.0.0 (2023-10-30)
 
 - Update `nix` to 0.27.
diff --git a/bin/version b/bin/version
index d6e6471..f0a2e90 100755
--- a/bin/version
+++ b/bin/version
@@ -39,7 +39,6 @@ fi
 
 date=$(date +%Y-%m-%d)
 echo "Next version to be $newver ($date), creating..."
-git switch -C release
 
 sed -E -i "s/^## Next.*$/## Next (YYYY-MM-DD)\n\n## v$newver ($date)/1" CHANGELOG.md
 sed -E -i "s/^command-group = \"$extver\"/command-group = \"$newver\"/1" README.md
@@ -49,13 +48,10 @@ sed -E -i "s/^version: \"?$extver\"?/version: \"$newver\"/1" CITATION.cff
 sed -E -i "s/^date-released: .+$/date-released: $date/1" CITATION.cff
 
 cargo check
+cargo publish --dry-run
 
 git commit -am "$newver"
 git tag -sam "$newver" "v$newver"
 
-echo "Pushing to upstream, make a PR for Bors then release with GH"
-git push -u $upstream release
-
-echo "Deleting local release branch"
-git switch main
-git branch -D release
+git push --follow-tags $upstream $mainbranch
+cargo publish --no-verify