summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-03-21 16:03:56 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-03-21 16:03:56 +0000
commitfdc5b834b6c93a9c8b459e48be7dfc6965a77112 (patch)
treea272c8e087506b92e012cc91b49f4b1d5811b422
parentad624c85cc091714672a6ddeb064847dc98356a6 (diff)
parentf8eec17ab9d41a1ef259bccf1df431e1b61392e4 (diff)
downloadnix-fdc5b834b6c93a9c8b459e48be7dfc6965a77112.zip
Merge #860
860: Update the release procedure r=asomers a=Susurrus Be more explicit about the development version to specify after doing a release. cc @nox Closes #468
-rw-r--r--RELEASE_PROCEDURE.md14
1 files changed, 6 insertions, 8 deletions
diff --git a/RELEASE_PROCEDURE.md b/RELEASE_PROCEDURE.md
index 4946539a..3429d130 100644
--- a/RELEASE_PROCEDURE.md
+++ b/RELEASE_PROCEDURE.md
@@ -14,6 +14,8 @@ The release is prepared as follows:
changes:
- In `CHANGELOG.md`, rename the Unreleased section to the new version
followed by the date of the release.
+ - Add a new Unreleased section header to `CHANGELOG.md` with the four
+ Added, Changed, Fixed, and Removed sections added.
- In `Cargo.toml`, update the version to the new version.
- In `Cargo.toml`, change the libc dependency to the latest version.
- In `README.md`, update the version in the Usage section to the new
@@ -30,11 +32,7 @@ The release is prepared as follows:
# After Release
-After the release make a pull request with the following changes:
-
-- Add a new Unreleased section header to `CHANGELOG.md`.
-- In `Cargo.toml`, update the version to the nextversion, e.g.
- `v0.8.4`.
-- In `Cargo.toml`, revert the libc dependency to its git master branch.
-- Make a commit of the above changes with a message like "[skip ci] Bump to v0.8.4"
- - This skips continuous integration testing on the build bots and Travis CI
+Once a release is done, all that's left is to change the `libc` version
+back to using the version from git. So make a pull request containing a
+simple commit entitled "Start the next dev cycle" that changes the `libc`
+dependency in `Cargo.toml` to using it from git master.