diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-27 13:03:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-27 13:03:55 -0500 |
| commit | 40c8e422577fadfbcc308a34cde4aa111ea9cfd0 (patch) | |
| tree | 78104bc4de1e84d2b61977319b95eb6fcd8c9038 | |
| parent | a020522f37241001b01ee77dab562d50b6e7a924 (diff) | |
| parent | 5ebccf22f54a6d49a429e1039e7bbda57fc4b3ab (diff) | |
| download | servo-40c8e422577fadfbcc308a34cde4aa111ea9cfd0.tar.gz servo-40c8e422577fadfbcc308a34cde4aa111ea9cfd0.zip | |
Auto merge of #24888 - servo:jdm-patch-31, r=SimonSapin
Update Git for Windows on CI.
There have been cygwin improvements since the version we are currently using, which I'm hoping might address #22212.
| -rw-r--r-- | etc/taskcluster/decision_task.py | 1 | ||||
| -rw-r--r-- | etc/taskcluster/decisionlib.py | 4 | ||||
| -rw-r--r-- | python/servo/command_base.py | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 5be3deef1d3..12f23734464 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -158,6 +158,7 @@ windows_build_env = { "all": { "PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe", "LINKER": "lld-link.exe", + "MOZTOOLS_PATH_PREPEND": "%HOMEDRIVE%%HOMEPATH%\\git\\cmd", }, } diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py index ef585657a32..dd277001b0c 100644 --- a/etc/taskcluster/decisionlib.py +++ b/etc/taskcluster/decisionlib.py @@ -533,8 +533,8 @@ class WindowsGenericWorkerTask(GenericWorkerTask): .with_path_from_homedir("git\\cmd") \ .with_directory_mount( "https://github.com/git-for-windows/git/releases/download/" + - "v2.19.0.windows.1/MinGit-2.19.0-64-bit.zip", - sha256="424d24b5fc185a9c5488d7872262464f2facab4f1d4693ea8008196f14a3c19b", + "v2.24.0.windows.2/MinGit-2.24.0.2-64-bit.zip", + sha256="c33aec6ae68989103653ca9fb64f12cabccf6c61d0dde30c50da47fc15cf66e2", path="git", ) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 20c02852d8a..7473b78844d 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -659,10 +659,16 @@ install them, let us know by filing a bug!") env["OPENSSL_LIB_DIR"] = path.join(openssl_base_dir, "lib") env["OPENSSL_LIBS"] = "libssl:libcrypto" # Link moztools, used for building SpiderMonkey - env["MOZTOOLS_PATH"] = os.pathsep.join([ + moztools_paths = [ path.join(self.msvc_package_dir("moztools"), "bin"), path.join(self.msvc_package_dir("moztools"), "msys", "bin"), - ]) + ] + # In certain cases we need to ensure that tools with conflicting MSYS versions + # can be placed in the PATH ahead of the moztools directories. + moztools_path_prepend = env.get("MOZTOOLS_PATH_PREPEND", None) + if moztools_path_prepend: + moztools_paths.insert(0, moztools_path_prepend) + env["MOZTOOLS_PATH"] = os.pathsep.join(moztools_paths) # Link autoconf 2.13, used for building SpiderMonkey env["AUTOCONF"] = path.join(self.msvc_package_dir("moztools"), "msys", "local", "bin", "autoconf-2.13") # Link LLVM |