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

Install jq when performing WPT sync job.

Browse source
This commit is contained in:
Josh Matthews 2019-05-07 11:09:23 -04:00
parent 0e1c641ebb
commit a5b5bab322
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
etc/taskcluster/decision_task.py
View file

@ -457,7 +457,7 @@ def macos_nightly():
def update_wpt(): def update_wpt():
# Reuse the release build that was made for landing the PR # Reuse the release build that was made for landing the PR
build_task = decisionlib.Task.find("build.macos_x64_release." + CONFIG.git_sha) build_task = decisionlib.Task.find("build.macos_x64_release." + CONFIG.git_sha)
return ( update_task = (
macos_task("WPT update") macos_task("WPT update")
.with_python2() .with_python2()
.with_treeherder("macOS x64", "WPT update") .with_treeherder("macOS x64", "WPT update")
@ -465,6 +465,9 @@ def update_wpt():
.with_scopes("secrets:get:project/servo/wpt-sync") .with_scopes("secrets:get:project/servo/wpt-sync")
.with_index_and_artifacts_expire_in(log_artifacts_expire_in) .with_index_and_artifacts_expire_in(log_artifacts_expire_in)
.with_max_run_time_minutes(5 * 60) .with_max_run_time_minutes(5 * 60)
)
return (
with_homebrew(update_task, "etc/taskcluster/macos/Brewfile-wpt")
.with_repo() .with_repo()
.with_curl_artifact_script(build_task, "target.tar.gz") .with_curl_artifact_script(build_task, "target.tar.gz")
.with_script(""" .with_script("""
@ -700,8 +703,19 @@ def windows_build_task(name, package=True, arch="x86_64"):
return task return task
def with_homebrew(task, brewfile):
return task.with_script("""
mkdir -p "$HOME/homebrew"
export PATH="$HOME/homebrew/bin:$PATH"
which brew || curl -L https://github.com/Homebrew/brew/tarball/master \
| tar xz --strip 1 -C "$HOME/homebrew"
time brew bundle install --no-upgrade --file={brewfile}
""".format(brewfile=brewfile))
def macos_build_task(name): def macos_build_task(name):
return ( build_task = (
macos_task(name) macos_task(name)
# Allow long runtime in case the cache expired for all those Homebrew dependencies # Allow long runtime in case the cache expired for all those Homebrew dependencies
.with_max_run_time_minutes(60 * 2) .with_max_run_time_minutes(60 * 2)
@ -709,13 +723,10 @@ def macos_build_task(name):
.with_repo() .with_repo()
.with_python2() .with_python2()
.with_rustup() .with_rustup()
)
return (
with_homebrew(build_task, "etc/taskcluster/macos/Brewfile")
.with_script(""" .with_script("""
mkdir -p "$HOME/homebrew"
export PATH="$HOME/homebrew/bin:$PATH"
which brew || curl -L https://github.com/Homebrew/brew/tarball/master \
| tar xz --strip 1 -C "$HOME/homebrew"
time brew bundle install --no-upgrade --file=etc/taskcluster/macos/Brewfile
export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include" export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"
export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib" export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib"
""") """)

1
etc/taskcluster/macos/Brewfile-wpt Normal file
View file

@ -0,0 +1 @@
brew "jq"