| ... |
... |
@@ -145,7 +145,7 @@ class BrowserBranch: |
|
145
|
145
|
# Minimal fetch of non-HEAD branch to get the file paths.
|
|
146
|
146
|
# Individual file blobs will be downloaded as needed.
|
|
147
|
147
|
git_run(
|
|
148
|
|
- ["fetch", "--depth=1", "--filter=blob:none", "origin", self._ref]
|
|
|
148
|
+ ["fetch", "--depth=1", "--filter=blob:none", "origin", self.name]
|
|
149
|
149
|
)
|
|
150
|
150
|
self._file_paths = git_lines(
|
|
151
|
151
|
["ls-tree", "-r", "--format=%(path)", self._ref]
|
| ... |
... |
@@ -178,7 +178,7 @@ def get_stable_branch( |
|
178
|
178
|
# Moreover, we *assume* that the branch with the most recent ESR version
|
|
179
|
179
|
# with such a tag will be used in the *next* stable build in
|
|
180
|
180
|
# tor-browser-build.
|
|
181
|
|
- tag_glob = f"{compare_version.prefix}-*esr-*-*-build1"
|
|
|
181
|
+ tag_glob = f"{compare_version.prefix}-*-build1"
|
|
182
|
182
|
|
|
183
|
183
|
# To speed up, only fetch the tags without blobs.
|
|
184
|
184
|
git_run(
|
| ... |
... |
@@ -188,10 +188,15 @@ def get_stable_branch( |
|
188
|
188
|
legacy_branches = []
|
|
189
|
189
|
stable_annotation_regex = re.compile(r"\bstable\b")
|
|
190
|
190
|
legacy_annotation_regex = re.compile(r"\blegacy\b")
|
|
|
191
|
+ tag_pattern = re.compile(
|
|
|
192
|
+ rf"^{re.escape(compare_version.prefix)}-[^-]+esr-[^-]+-[^-]+-build1$"
|
|
|
193
|
+ )
|
|
191
|
194
|
|
|
192
|
195
|
for build_tag, annotation in (
|
|
193
|
196
|
line.split(" ", 1) for line in git_lines(["tag", "-n1", "--list", tag_glob])
|
|
194
|
197
|
):
|
|
|
198
|
+ if not tag_pattern.match(build_tag):
|
|
|
199
|
+ continue
|
|
195
|
200
|
is_stable = bool(stable_annotation_regex.search(annotation))
|
|
196
|
201
|
is_legacy = bool(legacy_annotation_regex.search(annotation))
|
|
197
|
202
|
if not is_stable and not is_legacy:
|