morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: edd9b7fa by Morgan at 2025-08-04T15:23:25+00:00 Update release prep issue templates - - - - - 724b4e55 by Morgan at 2025-08-05T12:22:31+00:00 Bug 41531: Add support for updating application-services to tools/relprep.py script - - - - - 6 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md - tools/relprep.py Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -70,7 +70,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - **NOTE**: We try to build incrementals for the previous 3 desktop versions - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail - [ ] `projects/firefox/config` - - [ ] `browser_build`: updated to match `mullvad-browser` tag + - [ ] `var/browser_build`: updated to match `mullvad-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased - [ ] ***(Optional)*** `projects/translation/config`: - [ ] `steps/base-browser/git_hash`: updated with `HEAD` commit of project's `base-browser` branch ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -69,7 +69,7 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS - **NOTE**: We try to build incrementals for the previous 3 desktop versions - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail - [ ] `projects/firefox/config` - - [ ] `browser_build`: updated to match `mullvad-browser` tag + - [ ] `var/browser_build`: updated to match `mullvad-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased - [ ] ***(Optional)*** `projects/translation/config`: - [ ] `steps/base-browser/git_hash`: updated with `HEAD` commit of project's `base-browser` branch ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -70,11 +70,13 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - **NOTE**: We try to build incrementals for the previous 3 desktop versions - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail - [ ] `projects/firefox/config` - - [ ] `browser_build`: updated to match `tor-browser` tag + - [ ] `var/browser_build`: updated to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased - [ ] `projects/geckoview/config` - - [ ] `browser_build`: updated to match `tor-browser` tag + - [ ] `var/browser_build`: updated to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased + - [ ] ***(Optional)*** `projects/application-services/config` + - [ ] `var/build_number`: updated to match `application-services` tag - [ ] ***(Optional)*** `projects/translation/config`: - [ ] `steps/base-browser/git_hash`: updated with `HEAD` commit of project's `base-browser` branch - [ ] `steps/tor-browser/git_hash`: updated with `HEAD` commit of project's `tor-browser` branch @@ -100,7 +102,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] **(Optional)** `projects/go/config` https://go.dev/dl - **NOTE**: In general, Tor Browser Alpha uses the latest Stable major series Go version, but there are sometimes exceptions. Check with the anti-censorship team before doing a major version update in case there is incompatibilities. - [ ] `version`: updated go version - - [ ] `input_files/sha256sum` for `go`: update sha256sum of archive (sha256 sums are displayed on the go download page) + - [ ] `var/source_sha256sum` for `go`: update sha256sum of archive (sha256 sums are displayed on the go download page) - [ ] **(Optional)** `projects/manual/config` - [ ] `version`: updated to latest pipeline id - [ ] `input_files/shasum` for `manual`: updated to manual hash ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md ===================================== @@ -67,7 +67,7 @@ Tor Browser Legacy is on the `maint-13.5` branch - **NOTE**: We try to build incrementals for the previous 3 desktop versions - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail - [ ] `projects/firefox/config` - - [ ] `browser_build`: updated to match `tor-browser` tag + - [ ] `var/browser_build`: updated to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased - [ ] ***(Optional)*** `projects/translation/config`: - [ ] `steps/base-browser/git_hash`: updated with `HEAD` commit of project's `base-browser` branch ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -71,10 +71,10 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b - [ ] `var/torbrowser_legacy_version`: updated to latest legacy Tor Browser version - [ ] `var/torbrowser_legacy_platform_version`: updated to latest legacy Tor Browser ESR version - [ ] `projects/firefox/config` - - [ ] `browser_build`: updated to match `tor-browser` tag + - [ ] `var/browser_build`: updated to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased - [ ] `projects/geckoview/config` - - [ ] `browser_build`: updated to match `tor-browser` tag + - [ ] `var/browser_build`: updated to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version`: updated to latest `${ESR_VERSION}` if rebased - [ ] ***(Optional)*** `projects/translation/config`: - [ ] `steps/base-browser/git_hash`: updated with `HEAD` commit of project's `base-browser` branch @@ -101,7 +101,7 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b - [ ] **(Optional)** `projects/go/config` https://go.dev/dl - **NOTE**: In general, Tor Browser Alpha uses the latest Stable major series Go version, but there are sometimes exceptions. Check with the anti-censorship team before doing a major version update in case there is incompatibilities. - [ ] `version`: updated go version - - [ ] `input_files/sha256sum` for `go`: update sha256sum of archive (sha256 sums are displayed on the go download page) + - [ ] `var/source_sha256sum for `go`: update sha256sum of archive (sha256 sums are displayed on the go download page) - [ ] **(Optional)** `projects/manual/config` - [ ] `version`: updated to latest pipeline id - [ ] `input_files/shasum` for `manual`: updated to manual hash ===================================== tools/relprep.py ===================================== @@ -126,6 +126,7 @@ class ReleasePreparation: self.branch_sanity_check() self.update_firefox() + self.update_application_services() self.update_translations() self.update_addons() @@ -268,6 +269,50 @@ class ReleasePreparation: tag_info[2] += 1 return tag_info + def update_application_services(self): + if not self.android: + return + + logger.info("Updating application-services") + config = self.load_config("application-services") + tag = self._get_application_services_tag(config) + build_number = tag[0] + + config["var"]["build_number"] = build_number + self.save_config("application-services", config) + logger.debug("application-services configuration saved") + + def _get_application_services_tag(self, config): + version = config["version"] + branch = f"{version}-TORBROWSER" + + repo = Repo(self.base_path / "git_clones/application-services") + logger.debug("About to fetch application-services") + repo.remotes["origin"].fetch() + + tags = get_sorted_tags(repo) + tag_info = None + for t in tags: + logger.debug("tag: %s", t.tag) + m = re.match( + rf"v{branch}-build(\d+)", t.tag + ) + if m: + logger.debug("Matched tag %s", t.tag) + tag_info = [int(m.group(1))] + break + if tag_info is None: + raise RuntimeError("No compatible tag found.") + logger.debug("Checking if tag %s is head of %s.", t.tag, branch) + if t.object != repo.remotes["origin"].refs[branch].commit: + logger.info( + "Found new commits after tag %s, bumping the build number preemptively.", + t.tag, + ) + tag_info[0] += 1 + + return tag_info + def update_translations(self): logger.info("Updating translations") repo = Repo(self.base_path / "git_clones/translation") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/8... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/8... You're receiving this email because of your account on gitlab.torproject.org.