morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build
Commits:
8ccad839 by Morgan at 2024-11-23T01:32:47+00:00
Bug 41304: Backport tools/browser/.gitignore to hide main branch's symlinks
- - - - -
1 changed file:
- + tools/browser/.gitignore
Changes:
=====================================
tools/browser/.gitignore
=====================================
@@ -0,0 +1,3 @@
+basebrowser
+mullvadbrowser
+torbrowser
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build
Commits:
dfc023e6 by Pier Angelo Vendrame at 2024-11-23T01:01:15+00:00
Bug 41315: Fix the Mullvad Extension update in relprep.py.
- - - - -
5b395008 by Pier Angelo Vendrame at 2024-11-23T01:01:20+00:00
Bug 41284: Stop sync'ing changelogs between channels.
- - - - -
1 changed file:
- tools/relprep.py
Changes:
=====================================
tools/relprep.py
=====================================
@@ -306,6 +306,7 @@ class ReleasePreparation:
self.save_config("browser", config)
def update_addon_amo(self, config, name, addon_id):
+ logger.debug("Checking updates for %s", name)
r = requests.get(
f"https://services.addons.mozilla.org/api/v4/addons/addon/{addon_id}"
)
@@ -318,6 +319,7 @@ class ReleasePreparation:
addon_input["sha256sum"] = addon["hash"][7:]
def update_mullvad_addon(self, config):
+ logger.debug("Checking updates for the Mullvad addon")
input_ = self.find_input(config, "mullvad-extension")
r = requests.get(
"https://cdn.mullvad.net/browser-extension/updates.json"
@@ -336,11 +338,11 @@ class ReleasePreparation:
path = self.base_path / "out/browser" / url.split("/")[-1]
# The extension should be small enough to easily fit in memory :)
- if not path.exists:
+ if not path.exists():
r = requests.get(url)
r.raise_for_status()
with path.open("wb") as f:
- f.write(r.bytes)
+ f.write(r.content)
with path.open("rb") as f:
input_["sha256sum"] = sha256(f.read()).hexdigest()
logger.debug("Mullvad extension downloaded and updated")
@@ -546,14 +548,9 @@ class ReleasePreparation:
changelogs = cb.create(**kwargs)
path = f"projects/browser/Bundle-Data/Docs-{tag_prefix.upper()}/ChangeLog.txt"
- stable_tag = self.last_releases[(tag_prefix, "release")][0].tag
- alpha_tag = self.last_releases[(tag_prefix, "alpha")][0].tag
- if stable_tag.tagged_date > alpha_tag.tagged_date:
- last_tag = stable_tag
- else:
- last_tag = alpha_tag
- logger.debug("Using %s to add the new changelogs to.", last_tag.tag)
- last_changelogs = self.repo.git.show(f"{last_tag.tag}:{path}")
+ # Take HEAD to reset any changes we might already have from a
+ # previous run.
+ last_changelogs = self.repo.git.show(f"HEAD:{path}")
with (self.base_path / path).open("w") as f:
f.write(changelogs + "\n" + last_changelogs + "\n")
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
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:
992a7009 by Pier Angelo Vendrame at 2024-11-21T17:23:09+01:00
Bug 41315: Fix the Mullvad Extension update in relprep.py.
- - - - -
900f9f91 by Pier Angelo Vendrame at 2024-11-21T17:28:46+01:00
Bug 41284: Stop sync'ing changelogs between channels.
- - - - -
1 changed file:
- tools/relprep.py
Changes:
=====================================
tools/relprep.py
=====================================
@@ -306,6 +306,7 @@ class ReleasePreparation:
self.save_config("browser", config)
def update_addon_amo(self, config, name, addon_id):
+ logger.debug("Checking updates for %s", name)
r = requests.get(
f"https://services.addons.mozilla.org/api/v4/addons/addon/{addon_id}"
)
@@ -318,6 +319,7 @@ class ReleasePreparation:
addon_input["sha256sum"] = addon["hash"][7:]
def update_mullvad_addon(self, config):
+ logger.debug("Checking updates for the Mullvad addon")
input_ = self.find_input(config, "mullvad-extension")
r = requests.get(
"https://cdn.mullvad.net/browser-extension/updates.json"
@@ -336,11 +338,11 @@ class ReleasePreparation:
path = self.base_path / "out/browser" / url.split("/")[-1]
# The extension should be small enough to easily fit in memory :)
- if not path.exists:
+ if not path.exists():
r = requests.get(url)
r.raise_for_status()
with path.open("wb") as f:
- f.write(r.bytes)
+ f.write(r.content)
with path.open("rb") as f:
input_["sha256sum"] = sha256(f.read()).hexdigest()
logger.debug("Mullvad extension downloaded and updated")
@@ -546,14 +548,9 @@ class ReleasePreparation:
changelogs = cb.create(**kwargs)
path = f"projects/browser/Bundle-Data/Docs-{tag_prefix.upper()}/ChangeLog.txt"
- stable_tag = self.last_releases[(tag_prefix, "release")][0].tag
- alpha_tag = self.last_releases[(tag_prefix, "alpha")][0].tag
- if stable_tag.tagged_date > alpha_tag.tagged_date:
- last_tag = stable_tag
- else:
- last_tag = alpha_tag
- logger.debug("Using %s to add the new changelogs to.", last_tag.tag)
- last_changelogs = self.repo.git.show(f"{last_tag.tag}:{path}")
+ # Take HEAD to reset any changes we might already have from a
+ # previous run.
+ last_changelogs = self.repo.git.show(f"HEAD:{path}")
with (self.base_path / path).open("w") as f:
f.write(changelogs + "\n" + last_changelogs + "\n")
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build
Commits:
85f57f9b by Pier Angelo Vendrame at 2024-11-21T17:21:01+01:00
Bug 40996: Move .nobackup to the root of the repository.
The .nobackup files prevent from creating symlinks between clones,
which is useful for several use cases (multiple clones, directories
in different drives, etc...).
A .nobackup in the root will not interfere with symlinks anymore, and
we think it is acceptable, as a repo will probably be in sync with
GitLab or something similar.
git update-index --assume-unchanged can help if someone wants to
remove the .nobackup.
- - - - -
7 changed files:
- git_clones/.nobackup → .nobackup
- − hg_clones/.nobackup
- − mullvadbrowser/.nobackup
- − out/.nobackup
- − testbuild/.nobackup
- − tmp/.nobackup
- − torbrowser/.nobackup
Changes:
=====================================
git_clones/.nobackup → .nobackup
=====================================
=====================================
hg_clones/.nobackup deleted
=====================================
=====================================
mullvadbrowser/.nobackup deleted
=====================================
=====================================
out/.nobackup deleted
=====================================
=====================================
testbuild/.nobackup deleted
=====================================
=====================================
tmp/.nobackup deleted
=====================================
=====================================
torbrowser/.nobackup deleted
=====================================
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build
Commits:
81e3a2f4 by Pier Angelo Vendrame at 2024-11-21T17:20:46+01:00
Bug 40996: Move .nobackup to the root of the repository.
The .nobackup files prevent from creating symlinks between clones,
which is useful for several use cases (multiple clones, directories
in different drives, etc...).
A .nobackup in the root will not interfere with symlinks anymore, and
we think it is acceptable, as a repo will probably be in sync with
GitLab or something similar.
git update-index --assume-unchanged can help if someone wants to
remove the .nobackup.
- - - - -
7 changed files:
- git_clones/.nobackup → .nobackup
- − hg_clones/.nobackup
- − mullvadbrowser/.nobackup
- − out/.nobackup
- − testbuild/.nobackup
- − tmp/.nobackup
- − torbrowser/.nobackup
Changes:
=====================================
git_clones/.nobackup → .nobackup
=====================================
=====================================
hg_clones/.nobackup deleted
=====================================
=====================================
mullvadbrowser/.nobackup deleted
=====================================
=====================================
out/.nobackup deleted
=====================================
=====================================
testbuild/.nobackup deleted
=====================================
=====================================
tmp/.nobackup deleted
=====================================
=====================================
torbrowser/.nobackup deleted
=====================================
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
aab75f14 by Pier Angelo Vendrame at 2024-11-21T16:49:22+01:00
Bug 40996: Move .nobackup to the root of the repository.
The .nobackup files prevent from creating symlinks between clones,
which is useful for several use cases (multiple clones, directories
in different drives, etc...).
A .nobackup in the root will not interfere with symlinks anymore, and
we think it is acceptable, as a repo will probably be in sync with
GitLab or something similar.
git update-index --assume-unchanged can help if someone wants to
remove the .nobackup.
- - - - -
7 changed files:
- git_clones/.nobackup → .nobackup
- − hg_clones/.nobackup
- − mullvadbrowser/.nobackup
- − out/.nobackup
- − testbuild/.nobackup
- − tmp/.nobackup
- − torbrowser/.nobackup
Changes:
=====================================
git_clones/.nobackup → .nobackup
=====================================
=====================================
hg_clones/.nobackup deleted
=====================================
=====================================
mullvadbrowser/.nobackup deleted
=====================================
=====================================
out/.nobackup deleted
=====================================
=====================================
testbuild/.nobackup deleted
=====================================
=====================================
tmp/.nobackup deleted
=====================================
=====================================
torbrowser/.nobackup deleted
=====================================
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a…
You're receiving this email because of your account on gitlab.torproject.org.