morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build

Commits: 13b1b67d by Pier Angelo Vendrame at 2024-10-17T18:19:32+00:00 Bug 41274: Improve changelog generation for major releases.

This commits implements --include-from to get linked issues from many issues (potentially all the alpha release preps). It also implements --exclude-from to avoid including issues that were already linked to other rel preps (potentially the previous stables).

Also, make sure to look only for currently open issues, otherwise all the various alpha relpreps would be matched when specifying the version number.

- - - - - 4a3ec6ae by Pier Angelo Vendrame at 2024-10-17T18:19:41+00:00 Bug 41273: Bump Firefox/GeckoView tag when does not match HEAD.

If we detect the tag we would use for build does not match the HEAD of the branch we are using, bump it preemptively. Normally, we would add that tag when ready to build, so this change can help us in case we forget to. If the script is overzealous, we can change the build number before committing.

- - - - -

2 changed files:

- tools/fetch_changelogs.py - tools/relprep.py

Changes:

===================================== tools/fetch_changelogs.py ===================================== @@ -156,7 +156,7 @@ class ChangelogBuilder: elif not is_mullvad and is_mullvad is not None: labels += "&not[labels]=Sponsor 131" r = requests.get( - f"{API_URL}/projects/{PROJECT_ID}/issues?labels={labels}&search={issue_or_version}&in=title", + f"{API_URL}/projects/{PROJECT_ID}/issues?labels={labels}&search={issue_or_version}&in=title&state=opened", headers=self.headers, ) r.raise_for_status() @@ -196,7 +196,7 @@ class ChangelogBuilder: raise ValueError( "Inconsistency detected: a browser was explicitly specified, but the issue does not have the correct labels." ) - self.issue_id = issue["iid"] + self.relprep_issue = issue["iid"] self.is_mullvad = has_s131

if self.version is None: @@ -205,7 +205,9 @@ class ChangelogBuilder: self.version = version_match.group()

def create(self, **kwargs): - self._find_linked() + self._find_linked( + kwargs.get("include_from"), kwargs.get("exclude_from") + ) self._add_updates(kwargs) self._sort_issues() name = "Mullvad" if self.is_mullvad else "Tor" @@ -233,16 +235,46 @@ class ChangelogBuilder: text += f" * {issue}\n" return text

- def _find_linked(self): + def _find_linked(self, include_relpreps=[], exclude_relpreps=[]): self.issues = [] self.issues_build = []

+ if include_relpreps is None: + include_relpreps = [self.relprep_issue] + elif self.relprep_issue not in include_relpreps: + include_relpreps.append(self.relprep_issue) + if exclude_relpreps is None: + exclude_relpreps = [] + + included = {} + excluded = set() + for relprep in include_relpreps: + included.update( + { + issue["references"]["full"]: issue + for issue in self._get_linked_issues(relprep) + } + ) + for relprep in exclude_relpreps: + excluded.update( + [ + issue["references"]["full"] + for issue in self._get_linked_issues(relprep) + ] + ) + for ex in excluded: + if ex in included: + included.pop(ex) + for data in included.values(): + self._add_issue(data) + + def _get_linked_issues(self, issue_id): r = requests.get( - f"{API_URL}/projects/{PROJECT_ID}/issues/{self.issue_id}/links", + f"{API_URL}/projects/{PROJECT_ID}/issues/{issue_id}/links", headers=self.headers, ) - for i in r.json(): - self._add_issue(i) + r.raise_for_status() + return r.json()

def _add_issue(self, gitlab_data): self._add_entry(Issue(gitlab_data, self.is_mullvad)) @@ -334,6 +366,16 @@ if __name__ == "__main__": help="New Mullvad Browser Extension version (if updated)", ) parser.add_argument("--ublock", help="New uBlock version (if updated)") + parser.add_argument( + "--exclude-from", + help="Relprep issues to remove entries from, useful when doing a major release", + nargs="*", + ) + parser.add_argument( + "--include-from", + help="Relprep issues to add entries from, useful when doing a major release", + nargs="*", + ) args = parser.parse_args()

if not args.issue_version: @@ -350,17 +392,4 @@ if __name__ == "__main__": sys.exit(2) is_mullvad = args.browser == "mullvad-browser" if args.browser else None cb = ChangelogBuilder(token, args.issue_version, is_mullvad) - print( - cb.create( - date=args.date, - firefox=args.firefox, - tor=args.tor, - noscript=args.noscript, - openssl=args.openssl, - zlib=args.zlib, - zstd=args.zstd, - go=args.go, - mb_extension=args.mb_extension, - ublock=args.ublock, - ) - ) + print(cb.create(**vars(args)))

===================================== tools/relprep.py ===================================== @@ -250,6 +250,7 @@ class ReleasePreparation: logger.debug("About to fetch Firefox from %s.", remote) repo.remotes["origin"].fetch() tags = get_sorted_tags(repo) + tag_info = None for t in tags: m = re.match( r"(\w+-browser)-([^-]+)-([\d.]+)-(\d+)-build(\d+)", t.tag @@ -259,8 +260,21 @@ class ReleasePreparation: and m.group(1) == browser and m.group(3) == self.version.major ): + logger.debug("Matched tag %s.", t.tag) # firefox-version, rebase, build - return (m.group(2), int(m.group(4)), int(m.group(5))) + tag_info = [m.group(2), int(m.group(4)), int(m.group(5))] + break + if tag_info is None: + raise RuntimeError("No compatible tag found.") + branch = t.tag[: m.end(4)] + 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[2] += 1 + return tag_info

def update_firefox_android(self): logger.info("Updating firefox-android") @@ -402,9 +416,7 @@ class ReleasePreparation:

source = self.find_input(config, "openssl") # No need to update URL, as it uses a variable. - hash_url = ( - f"https://github.com/openssl/openssl/releases/download/openssl-%7Bversion%7D/o..." - ) + hash_url = f"https://github.com/openssl/openssl/releases/download/openssl-%7Bversion%7D/o..." r = requests.get(hash_url) r.raise_for_status() source["sha256sum"] = r.text.strip()

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/3...