From 4ac0c45ee41b6021d142d6427d7bf630c0436f99 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 14 Oct 2022 17:31:53 +0100
Subject: [PATCH 1/2] docs/release: Document cargo-release process

---
 docs/release.md | 49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index d6abd333628..9c98ce29e02 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -17,35 +17,22 @@ documentation will refer to `X.Y.Z` as _major_, _minor_ and _patch_ version.
 
 ## Releasing one or more crates
 
+### Prerequisites
+
+- [cargo release](https://github.com/crate-ci/cargo-release/)
+
+### Steps
+
 1. Remove the `[unreleased]` tag for each crate to be released in the respective
-   `CHANGELOG.md` and create a pull request against the rust-libp2p `master`
-   branch.
-
-2. Once merged, create and push a tag for each updated crate.
-
-    ```bash
-    cd $CRATE-PATH
-    tag="$(sed -En 's/^name = \"(.*)\"$/\1/p' Cargo.toml | head -n 1)-$(sed -En 's/^version = \"(.*)\"$/\1/p' Cargo.toml)"
-    # Use `-s` for a GPG signed tag or `-a` for an annotated tag.
-    git tag -s "${tag}" -m "${tag}"
-    git push origin "${tag}"
-    ```
-    
-3. Create and push a tag for the top level `libp2p` crate, if it is being
-   released.
-
-    ```bash
-    cd $REPOSITORY-ROOT
-    # Note the additional `v` here.
-    tag="v$(sed -En 's/^version = \"(.*)\"$/\1/p' Cargo.toml)"
-    git tag -s "${tag}" -m "${tag}"
-    git push origin "${tag}"
-    ```
-    
-4. Publish each tagged crate to crates.io. `cargo` assists in getting the order
-   of the releases correct.
-
-    ```
-    cd <CRATE-SUBDIRECTORY>
-    cargo publish
-    ```
+   `CHANGELOG.md`. Create a pull request with the changes against the
+   rust-libp2p `master` branch.
+
+2. Once merged, run `cargo release --workspace --sign-tag --no-push --execute`
+   on the (squash-) merged commit on the `master` branch.
+
+3. Confirm that `cargo release` tagged the commit correctly via `git push
+   $YOUR_ORIGIN --tag --dry-run` and then push the new tags via `git push
+   $YOUR_ORIGIN --tag`. Make sure not to push unrelated git tags.
+
+   Note that dropping the `--no-push` flag on `cargo release` might as well do
+   the trick.

From c55edf24b607ca395880b05c474b0684ee4449ff Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Fri, 14 Oct 2022 17:32:12 +0100
Subject: [PATCH 2/2] docs/release: Document update to root level changelog.md

---
 docs/release.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index 9c98ce29e02..033982b7e09 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -8,12 +8,12 @@ documentation will refer to `X.Y.Z` as _major_, _minor_ and _patch_ version.
 - Every substantial pull request should add an entry to the `[unreleased]`
   section of the corresponding crate `CHANGELOG.md` file. See
   [#1698](https://github.com/libp2p/rust-libp2p/pull/1698/files) as an example.
-  
-  In case there is no `[unreleased]` section yet, create one with an increased
-  major, minor or patch version depending on your change. In addition update the
-  version in the crate's `Cargo.toml` as well as the corresponding entry of the
-  crate in the root level `Cargo.toml`.
 
+  In case there is no `[unreleased]` section yet, create one with an increased
+  major, minor or patch version depending on your change. Update the version in
+  the crate's `Cargo.toml`. In addition update the corresponding entry of the
+  crate in the root level `Cargo.toml` and add an entry in the root level
+  `CHANGELOG.md`.
 
 ## Releasing one or more crates