Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mac nightly WPT sync #23338

Merged
merged 7 commits into from May 7, 2019

Install jq when performing WPT sync job.

  • Loading branch information
jdm committed May 7, 2019
commit a5b5bab322c3533f9f07289ec427004ec93adf50
@@ -457,14 +457,17 @@ def macos_nightly():
def update_wpt():
# Reuse the release build that was made for landing the PR
build_task = decisionlib.Task.find("build.macos_x64_release." + CONFIG.git_sha)
return (
update_task = (
macos_task("WPT update")
.with_python2()
.with_treeherder("macOS x64", "WPT update")
.with_features("taskclusterProxy")
.with_scopes("secrets:get:project/servo/wpt-sync")
.with_index_and_artifacts_expire_in(log_artifacts_expire_in)
.with_max_run_time_minutes(5 * 60)
)
return (
with_homebrew(update_task, "etc/taskcluster/macos/Brewfile-wpt")
.with_repo()
.with_curl_artifact_script(build_task, "target.tar.gz")
.with_script("""
@@ -700,22 +703,30 @@ def windows_build_task(name, package=True, arch="x86_64"):
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):
return (
build_task = (
macos_task(name)
# Allow long runtime in case the cache expired for all those Homebrew dependencies
.with_max_run_time_minutes(60 * 2)
.with_env(**build_env, **unix_build_env, **macos_build_env)
.with_repo()
.with_python2()
.with_rustup()
)
return (
with_homebrew(build_task, "etc/taskcluster/macos/Brewfile")
.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_LIB_DIR="$(brew --prefix openssl)/lib"
""")
@@ -0,0 +1 @@
brew "jq"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.