[tbb-commits] [builders/tor-browser-build] branch main updated: Bug 40612: Migrate Release Prep template to Release Prep - Stable

gitolite role git at cupani.torproject.org
Fri Aug 19 17:45:02 UTC 2022


This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch main
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push:
     new a9af1df  Bug 40612: Migrate Release Prep template to Release Prep - Stable
a9af1df is described below

commit a9af1dffe8c3187e0b9d7b4398076c2cfecf84f1
Author: Richard Pospesel <richard at torproject.org>
AuthorDate: Thu Aug 18 22:02:02 2022 +0000

    Bug 40612: Migrate Release Prep template to Release Prep - Stable
---
 .../{Release Prep.md => Release Prep - Stable.md}  | 210 ++++++++++-----------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/.gitlab/issue_templates/Release Prep.md b/.gitlab/issue_templates/Release Prep - Stable.md
similarity index 60%
rename from .gitlab/issue_templates/Release Prep.md
rename to .gitlab/issue_templates/Release Prep - Stable.md
index 9aac7ed..fd96937 100644
--- a/.gitlab/issue_templates/Release Prep.md	
+++ b/.gitlab/issue_templates/Release Prep - Stable.md	
@@ -19,15 +19,13 @@
     - example : `11`
 - `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version
     - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
-- `$(FIREFOX_BUILD_N)` : the firefox build revision within a given `tor-browser` branch; this is separate from the `$(TOR_BROWSER_BUILD_N) ` value
+- `$(BUILD_N)` : a project's build revision within a its branch; this is separate from the `$(TOR_BROWSER_BUILD_N)` value; many of the Firefox-related projects have a `$(BUILD_N)` suffix and may differ between projects even when they contribute to the same build.
     - example : `build1`
-- `$(GECKOVIEW_BUILD_N)` : like `$(FIREFOX_BUILD_N)` but for geckoview branches
-- `$(FENIX_BUILD_N)` : like `$(FIREFOX_BUILD_N)` but for fenix branches
 - `$(TOR_BROWSER_BUILD_N)` : the tor-browser build revision for a given Tor Browser release; used in tagging git commits
     - example : `build2`
-    - **NOTE** : `$(FIREFOX_BUILD_N)` and `$(TOR_BROWSER_BUILD_N)` typically are the same, but it is possible for them to diverge. For example :
-        - if we have multiple Tor Browser releases on a given ESR branch the two will become out of sync as the `$(FIREFOX_BUILD_N)` value will increase, while the `$(TOR_BROWSER_BUILD_N)` value may stay at `build1` (but the `$(TOR_BROWSER_VERSION)` will increase)
-        - if we have build failures unrelated to `tor-browser`, the `$(TOR_BROWSER_BUILD_N)` value will increase while the `$(FIREFOX_BUILD_N)` will stay the same.
+    - **NOTE** : A project's `$(BUILD_N)` and `$(TOR_BROWSER_BUILD_N)` may be the same, but it is possible for them to diverge. For example :
+        - if we have multiple Tor Browser releases on a given ESR branch the two will become out of sync as the `$(BUILD_N)` value will increase, while the `$(TOR_BROWSER_BUILD_N)` value may stay at `build1` (but the `$(TOR_BROWSER_VERSION)` will increase)
+        - if we have build failures unrelated to `tor-browser`, the `$(TOR_BROWSER_BUILD_N)` value will increase while the `$(BUILD_N)` will stay the same.
 - `$(TOR_BROWSER_VERSION)` : the published Tor Browser version
     - example : `11.5a6`, `11.0.7`
 - `$(TOR_BROWSER_BRANCH)` : the full name of tor-browser branch
@@ -47,7 +45,6 @@
   -  [ ] `./import-translations.sh`
   -  [ ] Commit with message `Translation updates`
      - **NOTE** : only add files which are already being tracked
-  -  [ ] *(Optional)* Backport to maintenance branch if present
 - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit
 
 ### **tor-launcher** ***(Optional)***: https://git.torproject.org/tor-launcher.git
@@ -57,39 +54,38 @@
   - [ ] Commit with message `Translation updates`
 - [ ] Update `install.rdf` file with new version
 - [ ] Sign/Tag commit :
-    - Tag : `$(TOR_LAUNCHER_VERSION)`
-    - Message `Tagging $(TOR_LAUNCHER_VERSION)`
+  - Tag : `$(TOR_LAUNCHER_VERSION)`
+  - Message `Tagging $(TOR_LAUNCHER_VERSION)`
 - [ ] Push `main` and tag to origin
 
 ### tor-browser: https://git.torproject.org/tor-browser.git
 - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)`
-    - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr91/tags
-        - [ ] `$(ESR_TAG)` : `INSERT_TAG_HERE`
-    - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message)
-        - [ ] `gecko-dev` commit : `INSERT_COMMIT_HASH_HERE`
-    - [ ] Create new `tor-browser` branch with the discovered `gecko-dev` commit as `HEAD` named `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
+  - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr91/tags
+    - [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>`
+  - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message)
+    - [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>`
+  - [ ] Create new `tor-browser` branch with the discovered `gecko-dev` commit as `HEAD` named `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
     - [ ] Sign/Tag commit :
-        - Tag : `$(ESR_TAG)`
-        - Message : `Hg tag $(ESR_TAG)`
-    - [ ] Push new branch and tag to origin
-    - [ ] Rebase `tor-browser` patches
-    - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts
-        - `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)`
-    - [ ] Open MR for the rebase
-- [ ] ***(Alpha Only)*** Sign/Tag base-browser commit:
-    **NOTE** : Currently we are using the `Bug 27511: Add new identity button to toolbar` commit as the dividing line between `base-browser` and `tor-browser`
-    - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1
-    - Message: `Tagging build1 for $(ESR_VERSION)esr-based (alpha|stable)`
+      - Tag : `$(ESR_TAG)`
+      - Message : `Hg tag $(ESR_TAG)`
+  - [ ] Push new branch and tag to origin
+  - [ ] Rebase `tor-browser` patches
+  - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase):
+    - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)`
+    - [ ] diff of diffs:
+        -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or -
+        - [ ] `git diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) > current_patchset.diff`
+        - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff`
+        - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff`
+  - [ ] Open MR for the rebase
 - [ ] ***(Optional)*** Backport any required patches to Stable
-    - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue
-    - [ ] Close associated `Backport` issues
-    - [ ] Open MR for the backport commits
-- [ ] Sign/Tag commit :
-    - Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)`
-    - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based (alpha|stable)`
-- [ ] Push tag to origin
-- [ ] ***(Alpha Only)*** Update Gitlab Default Branch to new Alpha branch
-     - https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repository
+  - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue)
+  - [ ] Close associated `Backport` issues
+  - [ ] Open MR for the backport commits
+- [ ] Sign/Tag `tor-browser` commit :
+  - Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)`
+  - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based (alpha|stable)`
+- [ ] Push tag to `origin`
 
 </details>
 
@@ -98,39 +94,43 @@
 
 ### **geckoview**: https://git.torproject.org/tor-browser.git
 - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)`
-    - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-release/tags
-        - [ ] `$(RR_TAG)` : `INSERT_TAG_HERE`
-    - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message)
-        - [ ] `gecko-dev` commit : `INSERT_COMMIT_HASH_HERE`
-    - [ ] Create new `geckoview` branch with the discovered `gecko-dev` commit as `HEAD` named `geckoview-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
-    - [ ] Sign/Tag commit :
-        - Tag : `$(RR_TAG)`
-        - Message : `Hg tag $(RR_TAG)`
-    - [ ] Push new branch and tag to origin
-    - [ ] Rebase `geckoview` patches
-    - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts
-        - `git range-diff $(RR_TAG_PREV)..$(GECKOVIEW_BRANCH_PREV) $(RR_TAG)..$(GECKOVIEW_BRANCH)`
-    - [ ] Open MR for the rebase
-    - [ ] Merge + Push
+  - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-release/tags
+    - [ ] `$(RR_TAG)` : `<INSERT_TAG_HERE>`
+  - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message)
+    - [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>`
+  - [ ] Create new `geckoview` branch with the discovered `gecko-dev` commit as `HEAD` named `geckoview-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
+  - [ ] Sign/Tag commit :
+    - Tag : `$(RR_TAG)`
+    - Message : `Hg tag $(RR_TAG)`
+  - [ ] Push new branch and tag to origin
+  - [ ] Rebase `geckoview` patches
+  - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase):
+    - [ ] rangediff: `git range-diff $(RR_TAG_PREV)..$(GECKOVIEW_BRANCH_PREV) $(RR_TAG)..$(GECKOVIEW_BRANCH)`
+    - [ ] diff of diffs:
+        -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or -
+        - [ ] `git diff $(RR_TAG_PREV)..$(GECKOVIEW_BRANCH_PREV) > current_patchset.diff`
+        - [ ] `git diff $(RR_TAG)..$(GECKOVIEW_BRANCH) > rebased_patchset.diff`
+        - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff`
+  - [ ] Open MR for the rebase
 - [ ] ***(Optional)*** Backport any required patches to Stable
-    - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue
-    - [ ] Close associated `Backport` issues
-    - [ ] Open MR for the backport commits
-    - [ ] Merge + Push
-- [ ] Sign/Tag commit :
-    - Tag : `geckoview-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)`
-    - Message : `Tagging $(FIREFOX_BUILD_N) for $(RR_VERSION)-based (alpha|stable)`
-- [ ] Push tag to origin
+  - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue)
+  - [ ] Close associated `Backport` issues
+  - [ ] Open MR for the backport commits
+  - [ ] Merge + Push
+- [ ] Sign/Tag `geckoview` commit :
+  - Tag : `geckoview-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)`
+  - Message : `Tagging $(FIREFOX_BUILD_N) for $(RR_VERSION)-based (alpha|stable)`
+- [ ] Push tag to `origin`
 
 ### **tba-translation** ***(Optional)***: https://git.torproject.org/translation.git
-- [ ] Fetch latest and identify new HEAD of `fenix-torbrowserstringsxml` branch
-  - [ ] `origin/fenix-torbrowserstringsxml` : `INSERT COMMIT HASH HERE`
+- [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch
+  - [ ] `origin/fenix-torbrowserstringsxml` :`<INSERT COMMIT HASH HERE>`
 
 ### **android-components** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/android-components.git
 - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)`
   - Upstream git repo : https://github.com/mozilla-mobile/android-components.git
-  - [ ] Identify the `mozilla-mobile` git tag to start from
-    - Seem to be in the form `v$(RR_VERSION)` (for example, `v99.0.3`)
+  - [ ] Identify the `mozilla-mobile` git tag to start from by first updating `fenix` and then checking which `android-components` tag is used in `buildSrc/src/main/java/AndroidComponents.kt`
+    - Alternatively search for commit message like `Update Android-Components`
   - [ ] Create new branch from tag named `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1`
   - [ ] Push new branch to origin
   - [ ] Rebase `android-components` patches
@@ -138,7 +138,7 @@
   - [ ] Open MR for the rebase
   - [ ] Merge + Push
  - [ ] ***(Optional)*** Backport any required patches to Stable
-  - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue
+  - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue)
   - [ ] Close associated `Backport` issues
   - [ ] Open MR for the backport commits
   - [ ] Merge + Push
@@ -148,8 +148,8 @@
 - [ ] Push tag to origin
 
 ### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git
-- [ ] Fetch latest and identify new HEAD of `master` branch
-  - [ ] `origin/master` : `INSERT COMMIT HASH HERE`
+- [ ] Fetch latest and identify new `HEAD` of `main` branch
+  - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>`
 
 ### **fenix** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/fenix.git
 - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)`
@@ -163,9 +163,8 @@
   - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts
   - [ ] Open MR for the rebase
   - [ ] Merge + Push
- - ***(Optional)*** Backport any required patches to Stable
 - [ ] ***(Optional)*** Backport any required patches to Stable
-  - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue
+  - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue)
   - [ ] Close associated `Backport` issues
   - [ ] Open MR for the backport commits
   - [ ] Merge + Push
@@ -183,43 +182,42 @@
 Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches
 
 - [ ] Update `rbm.conf`
-    - [ ] `var/torbrowser_version` : update to next version
-    - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)`
-    - [ ] `var/torbrowser_incremental_from` : update to previous version
-        - [ ] **IMPORTANT**: Really actually make sure this is the previous Desktop version or else the `make incrementals-*` step will fail
+  - [ ] `var/torbrowser_version` : update to next version
+  - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)`
+- [ ] `var/torbrowser_incremental_from` : update to previous version
+  - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail
 - [ ] Update `projects/firefox/config`
-    - [ ] `git_hash` : update the `$(FIREFOX_BUILD_N)` section to match `tor-browser` tag
-    - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest $(ESR_VERSION) if rebased
+  - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
+  - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
 - [ ] ***(Android Only)*** Update `projects/geckoview/config`
-    - [ ] `git_hash` : update the `$(GECKOVIEW_BUILD_N)` section to match `geckoview` tag
-    - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(RR_VERSION)` if rebased
+  - [ ] `git_hash` : update the `$(BUILD_N)` section to match `geckoview` tag
+  - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(RR_VERSION)` if rebased
+- [ ] Update `projects/translation-base-browser/config`
+  - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch
 - [ ] ***(Android Only, Optional)*** Update `projects/tba-translations/config`:
-  - [ ]  `git_hash` : update with HEAD commit of project's `fenix-torbrowserstringsxml` branch
+  - [ ]  `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
 - [ ] ***(Android Only, Optional)*** Update `projects/tor-android-service/config`
-  - [ ] `git_hash` : update with HEAD commit of project's `master` branch
-- [ ] ***(Android Only, Optionl)*** Update `projects/fenix/config`
-  - [ ] `git_hash` : update the `$(FENIX_BUILD_N)` section to match `fenix` tag
+  - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
+- [ ] ***(Android Only, Optional)*** Update `projects/fenix/config`
+  - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag
   - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(RR_VERSION)` if rebased
 - [ ] ***(Android Only)*** Update allowed_addons.json by running (from `tor-browser-build` root)`./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json
 - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript
-    - [ ] ***(Optional)*** If version available, update `noscript` section of `input_files` in `projects/browser/config`
-        - [ ] `URL`
-        - [ ] `sha256sum`
-- [ ] Update the translation branches
-  - [ ] Go to https://gitlab.torproject.org/tpo/translation/-/tree/base-browser/
-  - [ ] Copy the hash of the last commit
-  - [ ] Paste it into `projects/translation-base-browser/config`
-- [ ] Check for openssl updates here : https://github.com/openssl/openssl/tags
-    - [ ] ***(Optional)*** If new 1.X.Y series tag available, update `projects/openssl/config`
-        - [ ] `version` : update to next 1.X.Y release tag
-        - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball
+  - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`
+    - [ ] `URL`
+    - [ ] `sha256sum`
+- [ ] Check for OpenSSL updates here : https://github.com/openssl/openssl/tags
+  - [ ] ***(Optional)*** If new 1.X.Y series tag available, update `projects/openssl/config`
+    - [ ] `version` : update to next 1.X.Y release tag
+    - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball
 - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags ; Tor Browser Alpha uses `-alpha` tagged tor, while stable uses the stable series
-    - [ ] ***(Optional)*** If new tor version is available, update `projects/tor/config`
-        - [ ] `version` : update to next release tag
-- [ ] Check for go updates here : https://golang.org/dl (Tor Browser Alpha uses the latest Stable go version, while Tor Browser Stable uses the latest of the previous Stable major series version (eg: if Tor Browser Alpha is on the go1.17 series, Tor Browser Stable is on the go1.16 series)
-    - [ ] ***(Optional)*** If new go version is available, update `projects/go/config`
-        - [ ] `version` : update go version
-        - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page)
+  - [ ] ***(Optional)*** Update `projects/tor/config`
+    - [ ] `version` : update to next release tag
+- [ ] Check for go updates here : https://golang.org/dl
+  - **NOTE** : Tor Browser Alpha uses the latest Stable go version, while Tor Browser Stable uses the latest of the previous Stable major series version
+  - [ ] ***(Optional)*** Update `projects/go/config`
+    - [ ] `version` : update go version
+    - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page)
 - [ ] ***(Optional)*** Update the manual
   - [ ] Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/
   - [ ] Open the latest build stage
@@ -233,7 +231,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - [ ] Update `ChangeLog.txt`
   - [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches
 - [ ] Open MR with above changes
-- [ ] Begin build on `$(BUILD_SERVER)`
+- [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up)
 - [ ] Sign/Tag commit : `make signtag-(alpha|release)`
 - [ ] Push tag to origin
 
@@ -254,13 +252,14 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
     - [ ] Link to any Firefox security updates
     - [ ] Note any updates to :
         - [ ] tor
-        - [ ] openssl
+        - [ ] OpenSSL
         - [ ] go
-        - [ ] noscript
+        - [ ] NoScript
     - [ ] Convert ChangeLog.txt to markdown format used here by : `tor-browser-build/tools/changelog-format-blog-post`
 - [ ] Push to origin as new branch, open 'Draft :' MR
-- [ ] Remove draft from MR once signed-packages are uploaded
+- [ ] Remove `Draft:` from MR once signed-packages are uploaded
 - [ ] Merge
+- [ ] Publish after CI passes
 
 ### website: https://gitlab.torproject.org/tpo/web/tpo.git
 - [ ] `databags/versions.ini` : Update the downloads versions
@@ -270,8 +269,9 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
     - `torbrowser-*-alpha/version` : platform-specific alpha versions
     - `tor-stable`,`tor-alpha` : set by tor devs, do not touch
 - [ ] Push to origin as new branch, open 'Draft :' MR
-- [ ] Remove draft from MR once signed-packages are uploaded
+- [ ] Remove `Draft:` from MR once signed-packages are uploaded
 - [ ] Merge
+- [ ] Publish after CI passes
 
 ### signing + publishing
 - [ ] Ensure builders have matching builds
@@ -293,18 +293,18 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
     - `cd tor-browser-build/tools/signing/`
     - `./macos-signer-proxy`
 - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
-- [ ] ***(Android Only)*** : *TODO*
+- [ ] ***(Android Only)*** APK Signing: *TODO*
 - [ ] run do-all-signing script:
     - `cd tor-browser-build/tools/signing/`
     - `./do-all-signing.sh`
-- **NOTE**: at this point the signed desktop binaries should have been copied to `staticiforme`
+- **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
 - [ ] Update `staticiforme.torproject.org`:
-  - From `screen` session on `staticiforme.torproject.org`
+  - From `screen` session on `staticiforme.torproject.org`:
   - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org`
   - [ ] Enable update responses :
     - [ ] alpha: `./deploy_update_responses-alpha.sh`
     - [ ] release: `./deploy_update_responses-release.sh`
-- [ ] ***(Android Only)*** : Publish APKs to Google Play
+- [ ] ***(Android Only)*** : Publish APKs to Google Play:
   - [ ] Log into https://play.google.com/apps/publish
   - Select correct app:
     - [ ] Tor Browser
@@ -318,10 +318,10 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
   - [ ] Save, review, and configure rollout percentage
     - [ ] 25% rollout when publishing a scheduled update
     - [ ] 100% rollout when publishing a security-driven release
-  - [ ] ***Optional*** Update  rollout percentage to 100% after confirmed no major issues
+  - [ ] Update rollout percentage to 100% after confirmed no major issues
 
 ### tor-announce mailing list
-- [ ] ***(Stable release only)*** : send an email to tor-announce at lists.torproject.org, using the same content as the blog post and subject "Tor Browser $version is released".
+- [ ] Send an email to tor-announce at lists.torproject.org, using the same content as the blog post and subject "Tor Browser $version is released".
 
 </details>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the tbb-commits mailing list