From d7f8d770cb37ad6ed5e538d22820f83a89cd0bcf Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Thu, 7 May 2020 17:11:36 -0700 Subject: [PATCH] updated release management guide with new instructions for docs build --- docs/development/release_management.rst | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/docs/development/release_management.rst b/docs/development/release_management.rst index 1008b74eff..490b9b4d25 100644 --- a/docs/development/release_management.rst +++ b/docs/development/release_management.rst @@ -188,26 +188,10 @@ Release Process #. Ask Infrastructure to perform the DNS cutover to switch ``apt-qa.freedom.press`` to ``apt.freedom.press``. Once complete, the release is live. -#. Make sure that the default branch of documentation is being built - off the tip of the release branch. Building from the branch instead - of a given tag enables us to more easily add documentation changes - after release. You should: - - a. Log into readthedocs. - #. Navigate to **Projects** → **securedrop** → **Versions** → - **Inactive Versions** → **release/branch** → **Edit**. - #. Mark the branch as Active by checking the box and save your - changes. This will kick off a new docs build. - #. Once the documentation has built, it will appear in the version - selector at the bottom of the column of the. - #. Now set this new release as default by navigating to **Admin** → - **Advanced Settings** → **Global Settings** → **Default - Version**. - #. Select ``release/branch`` from the dropdown menu and save the - changes. - #. Verify that docs.securedrop.org redirects users to the - documentation built from the release branch. - +#. Issue a PR to merge the release branch changes into ``master``. Once the PR is + merged, verify that the `public documentation `_ + refers to the new release version. If not, log in to ReadTheDocs and start a + build of the ``master`` version. #. Create a `release `_ on GitHub with a brief summary of the changes in this release.