diff --git a/doc/release-process.md b/doc/release-process.md index 98fba9756..c7544588f 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -65,7 +65,7 @@ progress bar displayed during the build process. ## Release process -Identify the commit from which the release will be made. This is frequently the current +Identify the commit from which the release will be made. This could be the current `HEAD` of `master`, but it's also often useful to instead use a release stabilization branch based upon a previous release candidate when producing a release, so that development can proceed unblocked on the `master` branch during the release candidate @@ -160,20 +160,16 @@ Notify the Zcash DevOps engineer/sysadmin that the release has been tagged. They some variables in the company's automation code and then run an Ansible playbook, which: * builds Zcash based on the specified branch -* deploys it as a public service (e.g. betatestnet.z.cash, mainnet.z.cash) +* deploys it as a public service (e.g. testnet.z.cash, mainnet.z.cash) * often the same server can be re-used, and the role idempotently handles upgrades, but if not then they also need to update DNS records * possible manual steps: blowing away the `testnet3` dir, deleting old parameters, - restarting DNS seeder + restarting DNS seeder. -Then, verify that nodes can connect to the testnet server, and update the guide on the -wiki to ensure the correct hostname is listed in the recommended zcash.conf. +Verify that nodes can connect to the mainnet and testnet servers. -### Update the 1.0 User Guide - -This also means updating [the translations](https://github.com/zcash/zcash-docs). -Coordinate with the translation team for now. Suggestions for improving this -part of the process should be added to #2596. +Update the [Zcashd Full Node and CLI](https://zcash.readthedocs.io/en/latest/rtd_pages/zcashd.html) +documentation on ReadTheDocs to give the new version number. ### Publish the release announcement (blog, github, zcash-dev, slack) diff --git a/zcutil/make-release.py b/zcutil/make-release.py index 48f76b562..765a5e097 100755 --- a/zcutil/make-release.py +++ b/zcutil/make-release.py @@ -137,7 +137,7 @@ def verify_dependency_updates(): try: sh_log('./qa/zcash/updatecheck.py') except SystemExit: - raise SystemExit("Dependency update check failed. Either some updates not been correctly postponed, or the .updatecheck-token file is missing.") + raise SystemExit("Dependency update check failed. Either some updates have not been correctly postponed, or the .updatecheck-token file is missing.") @phase('Checking tags.') def verify_tags(revision, releaseprev, releasefrom):