eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap: Stop installing cargo-about (#44123)

Browse Source 
cargo-about is only used in the ./mach release command, which will only
be used by very few people (when preparing a release). Hence it doesn't
make sense to install it for everyone, and instead we can just tell the
user how to install if it is missing, and save resources for everyone
else.

Testing: Not tested, but trivial

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender
2026-04-11 18:55:42 +02:00
committed by GitHub
parent 6bfaab4079
commit a13e3852cd
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/servo/package_commands.py
View File

@@ -578,6 +578,10 @@ class PackageCommands(CommandBase):
print(f"Updated occurrence in {filename}.")
print("\r ➤ Updating license.html...")
# cargo about generate etc/about.hbs > resources/resource_protocol/license.html
if shutil.which("cargo-about") is None:
print("Updating license.html requires cargo-about, but it is not installed.", file=sys.stderr)
print("Install it with: `cargo install cargo-about --locked`", file=sys.stderr)
return 1
try:
# Remove resources/resource_protocol/license.html before regenerating it
license_html_path = path.join("resources", "resource_protocol", "license.html")

9
python/servo/platform/base.py
View File

@@ -62,7 +62,6 @@ class Base:
if not skip_nextest:
installed_something |= self.install_cargo_nextest(force)
if not skip_lints:
installed_something |= self.install_cargo_about(force)
installed_something |= self.install_taplo(force)
installed_something |= self.install_cargo_deny(force)
installed_something |= self.install_crown(force)
@@ -112,14 +111,6 @@ class Base:
raise EnvironmentError("Installation of cargo-deny failed.")
return True
def install_cargo_about(self, force: bool) -> bool:
if not force and shutil.which("cargo-about") is not None:
return False
print(" * Installing cargo-about...")
if subprocess.call(["cargo", "install", "cargo-about", "--locked"]) != 0:
raise EnvironmentError("Installation of cargo-about failed.")
return True
def install_cargo_nextest(self, force: bool) -> bool:
if not force and shutil.which("cargo-nextest") is not None:
return False