Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24888 - servo:jdm-patch-31, r=SimonSapin

Browse source 
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.
This commit is contained in:
bors-servo 2019-11-27 13:03:55 -05:00 • committed by GitHub
commit 40c8e42257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/taskcluster/decision_task.py
View file

@ -158,6 +158,7 @@ windows_build_env = {
"all": { "all": {
"PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe", "PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe",
"LINKER": "lld-link.exe", "LINKER": "lld-link.exe",
"MOZTOOLS_PATH_PREPEND": "%HOMEDRIVE%%HOMEPATH%\\git\\cmd",
}, },
} }

4
etc/taskcluster/decisionlib.py
View file

@ -533,8 +533,8 @@ class WindowsGenericWorkerTask(GenericWorkerTask):
.with_path_from_homedir("git\\cmd") \ .with_path_from_homedir("git\\cmd") \
.with_directory_mount( .with_directory_mount(
"https://github.com/git-for-windows/git/releases/download/" + "https://github.com/git-for-windows/git/releases/download/" +
"v2.19.0.windows.1/MinGit-2.19.0-64-bit.zip", "v2.24.0.windows.2/MinGit-2.24.0.2-64-bit.zip",
sha256="424d24b5fc185a9c5488d7872262464f2facab4f1d4693ea8008196f14a3c19b", sha256="c33aec6ae68989103653ca9fb64f12cabccf6c61d0dde30c50da47fc15cf66e2",
path="git", path="git",
) )

10
python/servo/command_base.py
View file

@ -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_LIB_DIR"] = path.join(openssl_base_dir, "lib")
env["OPENSSL_LIBS"] = "libssl:libcrypto" env["OPENSSL_LIBS"] = "libssl:libcrypto"
# Link moztools, used for building SpiderMonkey # 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"), "bin"),
path.join(self.msvc_package_dir("moztools"), "msys", "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 # Link autoconf 2.13, used for building SpiderMonkey
env["AUTOCONF"] = path.join(self.msvc_package_dir("moztools"), "msys", "local", "bin", "autoconf-2.13") env["AUTOCONF"] = path.join(self.msvc_package_dir("moztools"), "msys", "local", "bin", "autoconf-2.13")
# Link LLVM # Link LLVM