Bug 1743688: Fix some nuances of run-script r=jewilde
authorTom Ritter <tom@mozilla.com>
Tue, 04 Jan 2022 20:53:27 +0000
changeset 603679 681981a13d65dcf66cdee9eec2c7d9b990a47038
parent 603678 f3185bb3038fc36f1629a99ea104db4b9745dbfa
child 603680 9396be45dd736ebae6c40b2954e6aa618ee0afc4
push id155540
push usertritter@mozilla.com
push dateTue, 04 Jan 2022 20:56:10 +0000
treeherderautoland@1479cea7800d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjewilde
bugs1743688
milestone97.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1743688: Fix some nuances of run-script r=jewilde Depends on D129434 Differential Revision: https://phabricator.services.mozilla.com/D129436
python/mozbuild/mozbuild/vendor/vendor_manifest.py
--- a/python/mozbuild/mozbuild/vendor/vendor_manifest.py
+++ b/python/mozbuild/mozbuild/vendor/vendor_manifest.py
@@ -332,24 +332,29 @@ class VendorManifest(MozbuildObject):
                     logging.INFO,
                     "vendor",
                     {"path": path},
                     "Performing delete-path action path: {path}",
                 )
                 mozfile.remove(path)
             elif update["action"] == "run-script":
                 script = get_full_path(update["script"], support_cwd=True)
-                run_dir = get_full_path(update["cwd"])
+                run_dir = get_full_path(update["cwd"], support_cwd=True)
                 self.log(
                     logging.INFO,
                     "vendor",
                     {"script": script, "run_dir": run_dir},
                     "Performing run-script action script: {script} working dir: {run_dir}",
                 )
-                self.run_process(args=[script], cwd=run_dir, log_name=script)
+                self.run_process(
+                    args=[script],
+                    cwd=run_dir,
+                    log_name=script,
+                    require_unix_environment=True,
+                )
             else:
                 assert False, "Unknown action supplied (how did this pass validation?)"
 
     def update_moz_build(self, vendoring_dir, moz_yaml_dir, add_to_exports):
         if vendoring_dir == moz_yaml_dir:
             vendoring_dir = moz_yaml_dir = None
 
         # If you edit this (especially for header files) you should double check