Commit fe0eb447 authored by Tails developers's avatar Tails developers
Browse files

Improve release process doc.

parent fc383cbc
......@@ -25,6 +25,8 @@ the scripts snippets found on this page:
the `.packages` file) land.
* `MASTER_CHECKOUT`: a checkout of the `master` branch of the main
Tails Git repository.
* `RELEASE_BRANCH`: the name of the branch of the main Tails Git
repository used to prepare the release (`stable` or `testing`).
* `RELEASE_CHECKOUT`: a checkout of the branch of the main Tails Git
repository used to prepare the release (`stable` or `testing`).
* `TAILS_SIGNATURE_KEY=0D24B36AA9A2A651787876451202821CBE2CD9C1`
......@@ -317,8 +319,6 @@ Prepare incremental upgrades
Build the Incremental Upgrade Kits
----------------------------------
Skip this step when preparing a major release.
Use `tails-create-iuk` to build an IUK for the previous stable release
and (if applicable) the last RC for the version being released. Example:
......@@ -339,8 +339,6 @@ Wheezy too, but I would not even try to use it on Squeeze.
Prepare upgrade-description files
---------------------------------
Do **not** skip this step when preparing a major release.
1. Prepare upgrade-description files (see the [[upgrade-description
files
specification|contribute/design/incremental_upgrades#upgrade-description-files]]
......@@ -395,8 +393,8 @@ Do **not** skip this step when preparing a major release.
signatures to the Git branch used to prepare the release (`stable`
or `testing`):
cd "$RELEASE_CHECKOUT" && git add wiki/src/upgrade && \
git commit -m "Update upgrade-description files."
( cd "$RELEASE_CHECKOUT" && git add wiki/src/upgrade && \
git commit -m "Update upgrade-description files." )
1. Check the syntactic correctness of all upgrade-description files:
......@@ -430,7 +428,7 @@ Test them with a BitTorrent client running in a different place.
## Download and seed image from lizard
scp "$RELEASE_CHECKOUT/wiki/src/torrents/files/tails-i386-$VERSION.torrent" \
scp "$ISOS/tails-i386-$VERSION.torrent" \
bittorrent.lizard: && \
ssh bittorrent.lizard transmission-remote --add tails-i386-$VERSION.torrent
......@@ -504,8 +502,8 @@ steps. Please read on!
Update the website and Git repository
=====================================
What follows in this section happens on the `master` branch in
`$MASTER_CHECKOUT`.
What follows in this section happens on the release branch in
`$RELEASE_CHECKOUT`.
If preparing a final release
----------------------------
......@@ -529,7 +527,7 @@ into the website repository:
"$ARTIFACTS/tails-i386-$VERSION.packages" \
"$ISOS/tails-i386-$VERSION.torrent" \
"$ISOS/tails-i386-$VERSION.torrent.sig" \
"$MASTER_CHECKOUT/wiki/src/torrents/files/"
"$RELEASE_CHECKOUT/wiki/src/torrents/files/"
Remove from `wiki/src/torrents/files/` any remaining file from the
previous release (including any RC).
......@@ -623,7 +621,8 @@ Push
Push the last commits to our Git repository:
( cd "$MASTER_CHECKOUT" && git push )
( cd "$RELEASE_CHECKOUT" && git push ) && \
( cd "$MASTER_CHECKOUT" && git fetch && git merge "$RELEASE_BRANCH" && git push )
... and ask <root@boum.org> to refresh the ikiwiki wrappers for
our website.
......@@ -634,8 +633,12 @@ Bug tracker
Skip this part if preparing a release candidate.
Mark all issues fixed in this release as `Status: Resolved` in our bug
tracker. For a list of candidates, see the [issues in *Fix committed*
status](https://labs.riseup.net/code/projects/tails/issues?query_id=111).
tracker. For a list of candidates, see:
* the [issues in *Fix committed*
status](https://labs.riseup.net/code/projects/tails/issues?query_id=111);
* the "Fix committed" section on the [Release Manager
View](https://labs.riseup.net/code/projects/tails/issues?query_id=130).
IRC
---
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment