morgan pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
baa314e0 by Morgan at 2024-11-26T20:42:18+00:00
fixup! MB 188: Customize Gitlab Issue and Merge templates
update Sign and Tag step to use the sign-tag script in tor-browser-build
- - - - -
2 changed files:
- .gitlab/issue_templates/Rebase Browser - Alpha.md
- .gitlab/issue_templates/Rebase Browser - Stable.md
Changes:
=====================================
.gitlab/issue_templates/Rebase Browser - Alpha.md
=====================================
@@ -78,6 +78,9 @@
### **Sign and Tag**
- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:
- - **Tag**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable`
- - [ ] Push tag to `upstream`
+ - In **mullvad-browser.git**, checkout the new alpha `mullvad-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.mullvadbrowser alpha build1
+ ```
+ - [ ] Push tag to `upstream`
\ No newline at end of file
=====================================
.gitlab/issue_templates/Rebase Browser - Stable.md
=====================================
@@ -79,6 +79,9 @@
### **Sign and Tag**
- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:
- - **Tag**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable`
+ - In **mullvad-browser.git**, checkout the new stable `mullvad-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.mullvadbrowser stable build1
+ ```
- [ ] Push tag to `upstream`
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/baa…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/baa…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
e4c970bb by Morgan at 2024-11-26T20:39:29+00:00
fixup! Bug 41649: Create rebase and security backport gitlab issue templates
Add legacy rebase template and replace signing step with sign-tag script invocation in tor-browser-buildl
- - - - -
3 changed files:
- .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Legacy.md
- .gitlab/issue_templates/Rebase Browser - Stable.md
Changes:
=====================================
.gitlab/issue_templates/Rebase Browser - Alpha.md
=====================================
@@ -131,17 +131,23 @@
### **Sign and Tag**
- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch:
- - **Tag**: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based alpha`
+ - In **tor-browser.git**, checkout the new alpha `tor-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.torbrowser alpha build1
+ ```
- [ ] Push tag to `upstream`
- [ ] Sign/Tag HEAD of the merged `base-browser` branch:
- - **Tag**: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based alpha`
+ - In **tor-browser.git**, checkout the new alpha `base-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.basebrowser alpha build1
+ ```
- [ ] Push tag to `upstream`
-- [ ] Update tor-browser-build's main (no MR required, you can just push it if you have the permissions)
+- [ ] Update tor-browser-build's `main` branch (no MR required, you can just push it if you have the permissions)
- [ ] Update `projects/firefox/config`
- [ ] Update `firefox_platform_version`
- [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds)
- [ ] Update `projects/geckoview/config`
- - [ ] Update `geckoview_version`
- - [ ] Set `browser_build` to 1
+ - [ ] Update `firefox_platform_version`
+ - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds)
=====================================
.gitlab/issue_templates/Rebase Browser - Legacy.md
=====================================
@@ -0,0 +1,111 @@
+**NOTE:** All examples in this template reference the rebase from 115.17.0esr to 115.18.0esr
+
+<details>
+ <summary>Explanation of Variables</summary>
+
+- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc
+ - **Example**: `115.18.0`
+- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
+ - **Example**: `FIREFOX_115_18_0esr_BUILD1`
+- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from)
+ - **Example**: `FIREFOX_115_17_0esr_BUILD1`
+- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch
+ - **Example**: `base-browser-115.18.0esr-13.5-1`
+- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch
+ - **Example**: `base-browser-115.17.0esr-13.5-1`
+- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch
+ - **Example**: `tor-browser-115.18.0esr-13.5-1`
+- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch
+ - **Example**: `tor-browser-115.17.0esr-13.5-1`
+</details>
+
+### **Bookkeeping**
+
+- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue.
+
+### Update Branch Protection Rules
+
+- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…:
+ - [ ] Remove previous legacy `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
+ - [ ] Create new `base-browser` and `tor-browser` branch protection rule:
+ - **Branch**: `*-$(ESR_VERSION)esr-13.5-1*`
+ - **Example**: `*-115.18.0esr-13.5-1*`
+ - **Allowed to merge**: `Maintainers`
+ - **Allowed to push and merge**: `Maintainers`
+ - **Allowed to force push**: `false`
+
+### **Identify the Firefox Tagged Commit and Create New Branches**
+
+- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags
+ - **Example**: `FIREFOX_115_18_0esr_BUILD1`
+- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev
+ - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr115` branch to find the equivalent commit
+ - **Example**: `293d490d2e8d9fbb91c76336288f1287cbe285fb`
+- [ ] Sign and Tag `gecko-dev` commit
+ - Sign/Tag `gecko-dev` commit :
+ - **Tag**: `$(ESR_TAG)`
+ - **Message**: `Hg tag $(ESR_TAG)`
+- [ ] Create new legacy `base-browser` branch from tag
+ - Branch name in the form: `base-browser-$(ESR_VERSION)esr-13.5-1`
+ - **Example**: `base-browser-115.18.0esr-13.5-1`
+- [ ] Create new legacy `tor-browser` branch from
+ - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-13.5-1`
+ - **Example**: `tor-browser-115.18.0esr-13.5-1`
+- [ ] Push new `base-browser` branch to `upstream`
+- [ ] Push new `tor-browser` branch to `upstream`
+- [ ] Push new `$(ESR_TAG)` to `upstream`
+
+### **Rebase tor-browser**
+
+- [ ] Checkout a new local branch for the `tor-browser` rebase
+ - **Example**: `git branch tor-browser-rebase FIREFOX_115_18_0esr_BUILD1`
+- [ ] **(Optional)** `base-browser` rebase
+ - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag
+ - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch
+ - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..base-browser-115.17.0esr-13.5-1-build2`
+ - [ ] Rebase and autosquash these cherry-picked commits
+ - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1 HEAD`
+ - [ ] Cherry-pick remainder of patches after the `buildN` tag
+ - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build21..upstream/base-browser-115.17.0esr-13.5-1`
+- [ ] `tor-browser` rebase
+ - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD`
+ - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag
+ - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build1..tor-browser-115.17.0esr-13.5-1-build2
+ - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2`
+ - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)`
+ - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1`
+ - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag
+ - **Example**: `git cherry-pick tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1`
+ - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting.
+ - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1`
+- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
+ - [ ] diff of diffs:
+ - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -
+ - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff`
+ - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff`
+ - diff `current_patchset.diff` and `rebased_patchset.diff`
+ - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch)
+ - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD`
+ - **Example**: `git range-dif FIREFOX_115_17_0esr_BUILD1..upstream/tor-browser-115.17.0esr-13.5-1 FIREFOX_115_18_0esr_BUILD1..HEAD`
+- [ ] Open MR for the `tor-browser` rebase
+- [ ] Merge
+- Update and push `base-browser` branch
+ - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch
+ - [ ] Push these commits to `upstream`
+
+### **Sign and Tag**
+
+- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch:
+ - In **tor-browser.git**, checkout the new legacy `tor-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.torbrowser legacy build1
+ ```
+ - [ ] Push tag to `upstream`
+- [ ] Sign/Tag HEAD of the merged `base-browser` branch:
+ - In **tor-browser.git**, checkout the new legacy `base-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.basebrowser legacy build1
+ ```
+ - [ ] Push tag to `upstream`
=====================================
.gitlab/issue_templates/Rebase Browser - Stable.md
=====================================
@@ -100,10 +100,16 @@
### **Sign and Tag**
- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch:
- - **Tag**: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable`
+ - In **tor-browser.git**, checkout the new stable `tor-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.torbrowser stable build1
+ ```
- [ ] Push tag to `upstream`
- [ ] Sign/Tag HEAD of the merged `base-browser` branch:
- - **Tag**: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable`
+ - In **tor-browser.git**, checkout the new stable `base-browser` branch
+ - In **tor-browser-build.git**, run signing script:
+ ```bash
+ ./tools/browser/sign-tag.basebrowser stable build1
+ ```
- [ ] Push tag to `upstream`
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4c970b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4c970b…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
309b6ccb by Morgan at 2024-11-26T19:56:45+00:00
Update release prep merge request template
No longer syncing chnagelogs between channels
- - - - -
1 changed file:
- .gitlab/merge_request_templates/relprep.md
Changes:
=====================================
.gitlab/merge_request_templates/relprep.md
=====================================
@@ -39,7 +39,6 @@
- [ ] [Go](https://go.dev/dl): avoid major updates, unless planned
- [ ] Manual version update (Tor Browser only, optional)
- [ ] Changelogs
- - [ ] Changelogs must be in sync between stable and alpha
- [ ] Check the browser name
- [ ] Check the version
- [ ] Check the release date
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
60b4fd16 by Morgan at 2024-11-26T19:48:56+00:00
fixup! Adding issue and merge request templates
add rebase MR template
- - - - -
1 changed file:
- + .gitlab/merge_request_templates/Rebase.md
Changes:
=====================================
.gitlab/merge_request_templates/Rebase.md
=====================================
@@ -0,0 +1,23 @@
+## Merge Info
+
+<!-- Bookkeeping information for release management -->
+
+### Rebase Issue
+- tor-browser#xxxxx
+- mullvad-browser#xxxxx
+
+### Release Prep Issue
+- tor-browser-build#xxxxx
+
+### Issue Tracking
+- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation
+
+### Review
+
+#### Request Reviewer
+
+- [ ] Request review from a release engineer: boklm, dan, ma1, morgan, pierov
+
+#### Change Description
+
+<!-- Any interesting notes about the rebase and an overview of what the reviewer should expect from the diff of diffs and range-diff -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/60b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/60b…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
54b3f039 by Morgan at 2024-11-26T19:47:44+00:00
fixup! Adding issue and merge request templates
add rebase MR template
- - - - -
1 changed file:
- + .gitlab/merge_request_templates/Rebase.md
Changes:
=====================================
.gitlab/merge_request_templates/Rebase.md
=====================================
@@ -0,0 +1,23 @@
+## Merge Info
+
+<!-- Bookkeeping information for release management -->
+
+### Rebase Issue
+- tor-browser#xxxxx
+- mullvad-browser#xxxxx
+
+### Release Prep Issue
+- tor-browser-build#xxxxx
+
+### Issue Tracking
+- [ ] Link rebase issue with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation
+
+### Review
+
+#### Request Reviewer
+
+- [ ] Request review from a release engineer: boklm, dan, ma1, morgan, pierov
+
+#### Change Description
+
+<!-- Any interesting notes about the rebase and an overview of what the reviewer should expect from the diff of diffs and range-diff -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/54b3f03…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/54b3f03…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
4d3e22cd by Beatriz Rizental at 2024-11-26T10:03:34+00:00
fixup! Add CI for Tor Browser
- - - - -
1 changed file:
- .gitlab/ci/containers/base/Containerfile
Changes:
=====================================
.gitlab/ci/containers/base/Containerfile
=====================================
@@ -29,6 +29,8 @@ RUN apt-get update && apt-get install -y \
nasm \
pkgconf \
unzip \
+ x11-utils \
+ xvfb \
xz-utils \
wget && \
apt-get clean && \
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4d3e22c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4d3e22c…
You're receiving this email because of your account on gitlab.torproject.org.