diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /remote/mach_commands.py | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-adbda400be353e676059e335c3c0aaf99e719475.tar.xz firefox-adbda400be353e676059e335c3c0aaf99e719475.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'remote/mach_commands.py')
-rw-r--r-- | remote/mach_commands.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/remote/mach_commands.py b/remote/mach_commands.py index abf5615ce0..797f313dda 100644 --- a/remote/mach_commands.py +++ b/remote/mach_commands.py @@ -140,6 +140,14 @@ def vendor_puppeteer(command_context, repository, commitish, install): } run_npm( + "run", + "clean", + cwd=puppeteer_dir, + env=env, + exit_on_fail=False, + ) + + run_npm( "install", cwd=os.path.join(command_context.topsrcdir, puppeteer_dir), env=env, @@ -398,7 +406,7 @@ class PuppeteerRunner(MozbuildObject): """ setup() - binary = params.get("binary") or self.get_binary_path() + binary = params.get("binary") headless = params.get("headless", False) product = params.get("product", "firefox") with_cdp = params.get("cdp", False) @@ -432,10 +440,12 @@ class PuppeteerRunner(MozbuildObject): } if product == "firefox": - env["BINARY"] = binary + env["BINARY"] = binary or self.get_binary_path() env["PUPPETEER_PRODUCT"] = "firefox" env["MOZ_WEBRENDER"] = "%d" % params.get("enable_webrender", False) else: + if binary: + env["BINARY"] = binary env["PUPPETEER_CACHE_DIR"] = os.path.join( self.topobjdir, "_tests", @@ -727,6 +737,7 @@ def install_puppeteer(command_context, product, ci): puppeteer_test_dir = os.path.join(puppeteer_dir, "test") if product == "chrome": + env["PUPPETEER_PRODUCT"] = "chrome" env["PUPPETEER_CACHE_DIR"] = os.path.join( command_context.topobjdir, "_tests", puppeteer_dir, ".cache" ) @@ -744,6 +755,8 @@ def install_puppeteer(command_context, product, ci): # Always use the `ci` command to not get updated sub-dependencies installed. run_npm("ci", cwd=puppeteer_dir_full_path, env=env) + + # Build Puppeteer and the code to download browsers. run_npm( "run", "build", @@ -751,6 +764,9 @@ def install_puppeteer(command_context, product, ci): env=env, ) + # Run post install steps, including downloading the Chrome browser if requested + run_npm("run", "postinstall", cwd=puppeteer_dir_full_path, env=env) + def exit(code, error=None): if error is not None: |