diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/HACKING/ReleasingTor.md | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 86feef754e..9eb89b54de 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -49,10 +49,14 @@ been merged upstream. 1. Download the generated patches from the `Patches` stage. + Apply these patches to the `main` or `release` branch as appropriate. + (Version bumps apply to `maint`; anything touching the changelog should + apply only to `main` or `release`.) + 2. For the ChangeLog and ReleaseNotes, you need to write a blurb at the top explaining a bit the release. - 3. Review, modify if needed, and merged them upstream. + 3. Review, modify if needed, and merge them upstream. 4. Manually trigger the `maintained` job in the `Build` stage so the CI can build the tarballs without errors. @@ -80,12 +84,17 @@ Once all signatures from all selected developers have been committed: 3. Put them on `dist.torproject.org`: - Upload the tarball and its sig to the dist website, i.e. - `/srv/dist-master.torproject.org/htdocs/` on dist-master. Run - "static-update-component dist.torproject.org" on dist-master. + Upload the tarball and its sig to the dist website: + + `rsync -avP tor-0.3.5.18.tar.gz{,.asc} dist-master.torproject.org:/srv/dist-master.torproject.org/htdocs/` + + Then, on dist-master.torproject.org, run: - In the `project/web/tpo.git` repository, update `databags/versions.ini` - to note the new version. Push these changes to `master`. + `static-update-component dist.torproject.org` + + For an alpha or latest stable, open an MR in + https://gitlab.torproject.org/tpo/web/tpo that updates the + `databags/versions.ini` to note the new version. (NOTE: Due to #17805, there can only be one stable version listed at once. Nonetheless, do not call your version "alpha" if it is stable, or people @@ -100,8 +109,13 @@ Once all signatures from all selected developers have been committed: Once the tarballs have been uploaded and are ready to be announced, we need to do the following: - 1. Tag versions (main and maint) using `git tag -s tor-0.x.y.z-<status>` - and then push the tags: `git push origin --tags` + 1. Tag versions (`main` branch or `release` branch as appropriate) using + `git tag -s tor-0.x.y.z-<status>` and then push the tags: + `git push origin --tags` + + (This should be the `main` or `release` branch because that is the one + from which the tarballs are built. We want our tags to match our + tarballs.) 2. Merge upstream the artifacts from the `patches` job in the `Post-process` stage of the CI release pipeline. |