diff options
author | Josh Matthews <josh@joshmatthews.net> | 2019-05-21 15:09:38 -0400 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2019-05-21 21:20:38 -0400 |
commit | ceff9a61ef03f8e11de0f5cad3facc970b1d73fd (patch) | |
tree | 1030065182b3af22d43a350e0e00a946ced52533 | |
parent | 2406d0973a18ea151e098dc17829d76a79cb0d53 (diff) | |
download | servo-ceff9a61ef03f8e11de0f5cad3facc970b1d73fd.tar.gz servo-ceff9a61ef03f8e11de0f5cad3facc970b1d73fd.zip |
Allow pushing updated WPT results to git remote.
-rw-r--r-- | etc/taskcluster/decision_task.py | 3 | ||||
-rw-r--r-- | etc/taskcluster/decisionlib.py | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index abef75712ea..dda4382599f 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -490,7 +490,8 @@ def update_wpt(): "etc/taskcluster/macos/Brewfile-wpt", "etc/taskcluster/macos/Brewfile-gstreamer", ]) - .with_repo() + # Pushing the new changes to the git remote requires a full repo clone. + .with_repo(shallow=False) .with_curl_artifact_script(build_task, "target.tar.gz") .with_script(""" export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig/" diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py index 82d6dcacced..0a6d9b99e1c 100644 --- a/etc/taskcluster/decisionlib.py +++ b/etc/taskcluster/decisionlib.py @@ -427,7 +427,7 @@ class WindowsGenericWorkerTask(GenericWorkerTask): self.with_early_script("set PATH=%HOMEDRIVE%%HOMEPATH%\\{};%PATH%".format(p)) return self - def with_repo(self, sparse_checkout=None): + def with_repo(self, sparse_checkout=None, shallow=True): """ Make a shallow clone the git repository at the start of the task. This uses `CONFIG.git_url`, `CONFIG.git_ref`, and `CONFIG.git_sha`, @@ -452,9 +452,9 @@ class WindowsGenericWorkerTask(GenericWorkerTask): type .git\\info\\sparse-checkout """ git += """ - git fetch --depth 1 %GIT_URL% %GIT_REF% + git fetch {depth} %GIT_URL% %GIT_REF% git reset --hard %GIT_SHA% - """ + """.format(depth="--depth 1" if shallow else "") return self \ .with_git() \ .with_script(git) \ @@ -560,7 +560,7 @@ class UnixTaskMixin(Task): super().__init__(*args, **kwargs) self.curl_scripts_count = 0 - def with_repo(self): + def with_repo(self, shallow=True): """ Make a shallow clone the git repository at the start of the task. This uses `CONFIG.git_url`, `CONFIG.git_ref`, and `CONFIG.git_sha` @@ -578,9 +578,9 @@ class UnixTaskMixin(Task): .with_early_script(""" git init repo cd repo - git fetch --depth 1 "$GIT_URL" "$GIT_REF" + git fetch {depth} "$GIT_URL" "$GIT_REF" git reset --hard "$GIT_SHA" - """) + """.format(depth="--depth 1" if shallow else "")) def with_curl_script(self, url, file_path): self.curl_scripts_count += 1 |