[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [builders/tor-browser-build] branch main updated: Bug 40614: Update release templates with feedback from ma1



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 cc37607  Bug 40614: Update release templates with feedback from ma1
cc37607 is described below

commit cc3760710715c4bdb49b4a10e2112103ebd6e59b
Author: Richard Pospesel <richard@xxxxxxxxxxxxxx>
AuthorDate: Tue Aug 30 01:03:59 2022 +0000

    Bug 40614: Update release templates with feedback from ma1
---
 .gitlab/issue_templates/Release Prep - Alpha.md  | 37 +++++++++-----
 .gitlab/issue_templates/Release Prep - Stable.md | 61 ++++++++++++++++--------
 2 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/.gitlab/issue_templates/Release Prep - Alpha.md b/.gitlab/issue_templates/Release Prep - Alpha.md
index f6352a5..10432e1 100644
--- a/.gitlab/issue_templates/Release Prep - Alpha.md	
+++ b/.gitlab/issue_templates/Release Prep - Alpha.md	
@@ -59,11 +59,11 @@
 
 ### **tba-translation** : https://git.torproject.org/translation.git
 - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch
-  - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT_COMMIT_HASH_HERE>`
+  - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>`
 
 ### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git
 - [ ] Fetch latest and identify new `HEAD` of `main` branch
-  - [ ] `origin/main` : `<INSERT_COMMIT_HASH_HERE>`
+  - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>`
 
 ### ***Security Vulnerabilities Backport*** : https://www.mozilla.org/en-US/security/advisories/
 - [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported
@@ -114,8 +114,13 @@
       - 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)`
+  - [ ] 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
 - [ ] 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`
@@ -139,8 +144,8 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - [ ] 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
+  - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop 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 `$(BUILD_N)` section to match `tor-browser` tag
   - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
@@ -154,13 +159,15 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - [ ] Update `projects/tor-android-service/config`
   - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
 - [ ] Update `projects/application-services/config`:
-  - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `application-services` tag
+  **NOTE** we don't have any of our own patches for this project
+  - [ ] `git_hash` : update to appropriate git commit associated with $(ESR_VERSION)
 - [ ] Update `projects/android-components/config`:
   - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `android-components` tag
 - [ ] Update `projects/fenix/config`
   - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag
   - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased
-- [ ] Update allowed_addons.json by running (from `tor-browser-build` root) `./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json`
+- [ ] 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 new version available, update `noscript` section of `input_files` in `projects/browser/config`
     - [ ] `URL`
@@ -259,15 +266,17 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
 - [ ] Update `staticiforme.torproject.org`:
   - From `screen` session on `staticiforme.torproject.org`:
+  - [ ] Remove old release data from following places:
+    - **NOTE** : Skip this step if the current release is Android or Desktop *only*
+    - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser`
+    - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser`
   - [ ] 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`
 - [ ] Publish APKs to Google Play:
   - [ ] Log into https://play.google.com/apps/publish
-  - Select correct app:
-    - [ ] Tor Browser
-    - [ ] Tor Browser Alpha
+  - [ ] Select `Tor Browser (Alpha)` app
   - [ ] Navigate to `Release > Production` and click `Create new release` button
   - [ ] Upload the `*.multi.apk` APKs
   - [ ] If necessary, update the 'Release Name' (should be automatically populated)
@@ -277,8 +286,12 @@ 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
-  - [ ] Update  rollout percentage to 100% after confirmed no major issues
+  - [ ] Update rollout percentage to 100% after confirmed no major issues
+
+### tor-announce mailing list
+- [ ] Send an email to tor-announce@xxxxxxxxxxxxxxxxxxxx, using the same content as the blog post and subject "Tor Browser $version is released".
 
 </details>
 
 /label ~"Release Prep"
+
diff --git a/.gitlab/issue_templates/Release Prep - Stable.md b/.gitlab/issue_templates/Release Prep - Stable.md
index ec9234c..a93f472 100644
--- a/.gitlab/issue_templates/Release Prep - Stable.md	
+++ b/.gitlab/issue_templates/Release Prep - Stable.md	
@@ -41,15 +41,16 @@
 
 ### **torbutton** ***(Optional)***: https://git.torproject.org/torbutton.git
 - [ ] ***(Optional)*** Update translations :
-  - **NOTE** : mandatory if we have added new string dependencies
-  -  [ ] `./import-translations.sh`
-  -  [ ] Commit with message `Translation updates`
-     - **NOTE** : only add files which are already being tracked
+  - **NOTE** We only update strings in stable if a backported feature depends on new strings
+  - [ ] `./import-translations.sh`
+    - **NOTE** : if there are no new strings imported then we are done here
+  - [ ] Commit with message `Translation updates`
+    - **NOTE** : only add files which are already being tracked
 - [ ] 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
 - [ ] ***(Optional)*** Update translations:
-  - **NOTE** : mandatory if we have added new string dependencies
+  - **NOTE** We only update strings in stable if a backported feature depends on new strings
   - [ ] ./localization/import-translations.sh
   - [ ] Commit with message `Translation updates`
 - [ ] Update `install.rdf` file with new version
@@ -78,7 +79,7 @@
         - [ ] `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
+- [ ] ***(Optional)*** Backport any required Alpha 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
@@ -123,12 +124,22 @@
 - [ ] Push tag to `origin`
 
 ### **tba-translation** ***(Optional)***: https://git.torproject.org/translation.git
+- **NOTE** We only update strings in stable if a backported feature depends on new strings
 - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch
-  - [ ] `origin/fenix-torbrowserstringsxml` :`<INSERT COMMIT HASH HERE>`
+  - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>`
 
+### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git
+- [ ] Fetch latest and identify new `HEAD` of `main` branch
+  - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>`
+
+### **application-services** : *TODO: we need to setup a gitlab copy of this repo that we can apply security backports to*
+- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release
+- [ ] Sign/Tag commit:
+  - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)`
+  - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based (alpha|stable)`
+- [ ] Push tag to `origin`
 ### **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 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`
@@ -137,19 +148,15 @@
   - [ ] 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)
   - [ ] Close associated `Backport` issues
   - [ ] Open MR for the backport commits
   - [ ] Merge + Push
-- [ ] Sign/Tag commit:
+ [ ] Sign/Tag commit:
   - Tag : `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)`
   - Message: `Tagging $(BUILD_N) for $(RR_VERSION)-based (alpha|stable)`
-- [ ] Push tag to origin
-
-### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git
-- [ ] Fetch latest and identify new `HEAD` of `main` branch
-  - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>`
+  - [ ] Push tag to origin
 
 ### **fenix** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/fenix.git
 - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)`
@@ -184,9 +191,9 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - [ ] 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
+  - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop version
     - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail
-- [ ] Update `projects/firefox/config`
+- [ ] ***(Desktop Only)*** Update `projects/firefox/config`
   - [ ] `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`
@@ -196,10 +203,17 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
   - [ ]  `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 `main` branch
+- [ ] ***(Android Only, Optional)*** Update `projects/application-services/config`:
+  **NOTE** we don't have any of our own patches for this project
+  - [ ] `git_hash` : update to appropriate git commit associated with $(RR_VERSION)
+- [ ] ***(Android Only, Optional)*** Update `projects/android-components/config`
+  - [ ] `git_hash` : update the `$(BUILD_N)` section to match `android-components` tag
+  - [ ] ***(Optional)*** `var/android_components_version` : update to latest `$(RR_VERSION)` if rebased
 - [ ] ***(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`
+- [ ] ***(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 new version available, update `noscript` section of `input_files` in `projects/tor-browser/config`
     - [ ] `URL`
@@ -298,15 +312,17 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
 - [ ] Update `staticiforme.torproject.org`:
   - From `screen` session on `staticiforme.torproject.org`:
+  - [ ] Remove old release data from following places:
+    - **NOTE** : Skip this step if the current release is Android or Desktop *only*
+    - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser`
+    - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser`
   - [ ] 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:
   - [ ] Log into https://play.google.com/apps/publish
-  - Select correct app:
-    - [ ] Tor Browser
-    - [ ] Tor Browser Alpha
+  - [ ] Select `Tor Browser` app
   - [ ] Navigate to `Release > Production` and click `Create new release` button
   - [ ] Upload the `*.multi.apk` APKs
   - [ ] If necessary, update the 'Release Name' (should be automatically populated)
@@ -322,3 +338,6 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
 - [ ] Send an email to tor-announce@xxxxxxxxxxxxxxxxxxxx, using the same content as the blog post and subject "Tor Browser $version is released".
 
 </details>
+
+/label ~"Release Prep"
+

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits