From d1a42fc4e59943ee0680de73d0941fcb5311c4a6 Mon Sep 17 00:00:00 2001 From: James Graham Date: Thu, 9 Mar 2017 13:08:55 +0000 Subject: [PATCH] Skip travis when upstreaming wpt commits. Since we currently just delete the branch before CI runs causing errors and unnneccessary resource usage. --- tests/wpt/update/upstream.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/wpt/update/upstream.py b/tests/wpt/update/upstream.py index 08d8a24536f..7423a52cada 100644 --- a/tests/wpt/update/upstream.py +++ b/tests/wpt/update/upstream.py @@ -42,16 +42,14 @@ def rewrite_patch(patch, strip_dir): return Patch(patch.author, patch.email, rewrite_message(patch), new_diff) def rewrite_message(patch): - rest = patch.message.body - if patch.message.bug is not None: return "\n".join([patch.message.summary, patch.message.body, "", - "Upstreamed from https://bugzilla.mozilla.org/show_bug.cgi?id=%s" % + "Upstreamed from https://bugzilla.mozilla.org/show_bug.cgi?id=%s [ci skip]" % patch.message.bug]) - return "\n".join([patch.message.full_summary, rest]) + return "\n".join([patch.message.full_summary, "%s\n[ci skip]\n" % patch.message.body]) class SyncToUpstream(Step):