From b8ea6fb50713edf9b27eff11905255e5199fc432 Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Wed, 14 Feb 2018 08:24:27 -0500 Subject: [Android Compile Bot] Check if patch/hash is not from origin/master NoTry: true Bug: skia:7615 Change-Id: I824ef67971195b0611cbcf7ce7ad0a289c4c55b9 Reviewed-on: https://skia-review.googlesource.com/106981 Commit-Queue: Ravi Mistry Reviewed-by: Eric Boren --- infra/bots/android_compile/trigger_wait_ac_task.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/infra/bots/android_compile/trigger_wait_ac_task.py b/infra/bots/android_compile/trigger_wait_ac_task.py index 9b74cd8e29..e5be7723c2 100644 --- a/infra/bots/android_compile/trigger_wait_ac_task.py +++ b/infra/bots/android_compile/trigger_wait_ac_task.py @@ -123,7 +123,12 @@ def TriggerAndWait(options): if ret["done"]: print print - if ret["withpatch_success"]: + if not ret.get("is_master_branch", True): + print 'The Android Framework Compile bot only works for patches and' + print 'hashes from the master branch.' + print + return 0 + elif ret["withpatch_success"]: print 'Your run was successfully completed.' print print 'With patch logs are here: %s' % ret["withpatch_log"] -- cgit v1.2.3