| ... |
... |
@@ -28,19 +28,6 @@ |
|
28
|
28
|
- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous tor-browser branch (when rebasing)
|
|
29
|
29
|
</details>
|
|
30
|
30
|
|
|
31
|
|
-<details>
|
|
32
|
|
- <summary>Desktop</summary>
|
|
33
|
|
-
|
|
34
|
|
-### **torbutton** : https://gitlab.torproject.org/tpo/applications/torbutton.git
|
|
35
|
|
-- [ ] Update translations :
|
|
36
|
|
- - [ ] `./import-translations.sh`
|
|
37
|
|
- - **NOTE** : if there are no new strings imported then we are done here
|
|
38
|
|
- - [ ] Commit with message `Translation updates`
|
|
39
|
|
- - **NOTE** : only add files which are already being tracked
|
|
40
|
|
-- [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit
|
|
41
|
|
-
|
|
42
|
|
-</details>
|
|
43
|
|
-
|
|
44
|
31
|
<details>
|
|
45
|
32
|
<summary>Android</summary>
|
|
46
|
33
|
|
| ... |
... |
@@ -88,15 +75,13 @@ |
|
88
|
75
|
- [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>`
|
|
89
|
76
|
- [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message)
|
|
90
|
77
|
- [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>`
|
|
91
|
|
- - [ ] Sign/Tag commit :
|
|
|
78
|
+ - [ ] Sign/Tag `gecko-dev` commit :
|
|
92
|
79
|
- Tag : `$(ESR_TAG)`
|
|
93
|
80
|
- Message : `Hg tag $(ESR_TAG)`
|
|
94
|
|
- - [ ] Create new branches with the discovered `gecko-dev` commit as `HEAD` named:
|
|
95
|
|
- - [ ] `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
|
|
96
|
|
- - [ ] `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
|
|
|
81
|
+ - [ ] Create new `tor-browser` branch with the discovered `gecko-dev` commit as `HEAD` named:
|
|
|
82
|
+ - `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
|
|
97
|
83
|
- [ ] Push new branches and esr tag to origin
|
|
98
|
|
- - [ ] Rebase previous `base-browser` patches onto the `gecko-dev` commit
|
|
99
|
|
- - [ ] Rebase previous `tor-browser` patches onto the new `base-browser` branch
|
|
|
84
|
+ - [ ] Rebase previous `tor-browser` patches onto the new `gecko-dev` branch
|
|
100
|
85
|
- [ ] Compare patch-sets (ensure nothing *weird* happened during rebase):
|
|
101
|
86
|
- [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)`
|
|
102
|
87
|
- [ ] diff of diffs:
|
| ... |
... |
@@ -105,14 +90,17 @@ |
|
105
|
90
|
- [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff`
|
|
106
|
91
|
- [ ] `$(DIFF_TOOL) current_patchset.diff rebased_patchset.diff`
|
|
107
|
92
|
- [ ] Open MR for the rebase
|
|
108
|
|
-- [ ] Sign/Tag `base-browser` commit:
|
|
109
|
|
- - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser`
|
|
110
|
|
- - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1`
|
|
111
|
|
- - Message: `Tagging build1 for $(ESR_VERSION)esr-based stable`
|
|
|
93
|
+ - [ ] Merge
|
|
112
|
94
|
- [ ] Sign/Tag `tor-browser` commit :
|
|
113
|
95
|
- Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)`
|
|
114
|
96
|
- Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based stable`
|
|
115
|
|
-- [ ] Push rebased branches and tags to `origin`
|
|
|
97
|
+- [ ] Create `base-browser` branch from rebased `tor-browser` branch named:
|
|
|
98
|
+ - `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1`
|
|
|
99
|
+ - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser`
|
|
|
100
|
+- [ ] Sign/Tag `base-browser` commit:
|
|
|
101
|
+ - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1`
|
|
|
102
|
+ - Message: `Tagging build1 for $(ESR_VERSION)esr-based stable`
|
|
|
103
|
+- [ ] Push tags to `origin`
|
|
116
|
104
|
|
|
117
|
105
|
</details>
|
|
118
|
106
|
|
| ... |
... |
@@ -120,7 +108,7 @@ |
|
120
|
108
|
<summary>Build</summary>
|
|
121
|
109
|
|
|
122
|
110
|
### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git
|
|
123
|
|
-Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches
|
|
|
111
|
+Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches
|
|
124
|
112
|
|
|
125
|
113
|
- [ ] Update `rbm.conf`
|
|
126
|
114
|
- [ ] `var/torbrowser_version` : update to next version
|
| ... |
... |
@@ -141,8 +129,6 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in |
|
141
|
129
|
- [ ] ***(Optional)*** Update `projects/geckoview/config`
|
|
142
|
130
|
- [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
|
|
143
|
131
|
- [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased
|
|
144
|
|
- - [ ] Update `projects/tba-translations/config`:
|
|
145
|
|
- - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
|
|
146
|
132
|
- [ ] ***(Optional)*** Update `projects/tor-android-service/config`
|
|
147
|
133
|
- [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
|
|
148
|
134
|
- [ ] ***(Optional)*** Update `projects/application-services/config`:
|
| ... |
... |
@@ -175,10 +161,8 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in |
|
175
|
161
|
- [ ] ***(Optional)*** Update `projects/go/config`
|
|
176
|
162
|
- [ ] `version` : update go version
|
|
177
|
163
|
- [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page)
|
|
178
|
|
- - [ ] ***(Optional)*** Update the manual
|
|
179
|
|
- - [ ] Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/
|
|
180
|
|
- - [ ] Open the latest build stage
|
|
181
|
|
- - [ ] Download the artifacts (they come in a .zip file).
|
|
|
164
|
+ - [ ] ***(Optional)*** Update the manual : https://gitlab.torproject.org/tpo/web/manual/-/jobs/
|
|
|
165
|
+ - [ ] Download the `artifacts.zip` file from latest build stage row (download icon button on the right)
|
|
182
|
166
|
- [ ] Rename it to `manual_$PIPELINEID.zip`
|
|
183
|
167
|
- [ ] Upload it to people.tpo
|
|
184
|
168
|
- [ ] Update `projects/manual/config`
|
| ... |
... |
@@ -187,10 +171,18 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in |
|
187
|
171
|
- [ ] Update the URL if you have uploaded to a different people.tpo home
|
|
188
|
172
|
- [ ] Update `ChangeLog.txt`
|
|
189
|
173
|
- [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches
|
|
|
174
|
+ - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones
|
|
|
175
|
+ - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`
|
|
|
176
|
+ - Make sure you have `requests` installed (e.g., `apt install python3-requests`)
|
|
|
177
|
+ - The first time you run this script you will need to generate an access token; the script will guide you
|
|
|
178
|
+ - [ ] Copy the output of the script to the beginning of `ChangeLog.txt` and adjust its output
|
|
|
179
|
+ - At the moment, the script does not create a _Build System_ section
|
|
|
180
|
+ - If you used the issue number, you will need to write the Tor Browser version manually
|
|
190
|
181
|
- [ ] Open MR with above changes
|
|
191
|
182
|
- [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up and update MR)
|
|
|
183
|
+- [ ] Merge
|
|
192
|
184
|
- [ ] Sign/Tag commit: `make signtag-release`
|
|
193
|
|
-- [ ] Push tag to origin
|
|
|
185
|
+- [ ] Push tag to `origin`
|
|
194
|
186
|
</details>
|
|
195
|
187
|
|
|
196
|
188
|
<details>
|