Ignore adhoc tags in reverse_integration_check

// FREEBIE
7 years ago · eca2af03bf
parent df6dbd5719
commit eca2af03bf
1 changed files with 4 additions and 1 deletions
--- a/Scripts/reverse_integration_check.py
+++ b/Scripts/reverse_integration_check.py
@ -33,7 +33,10 @@ def main():

    logging.debug("ignoring tags before epoch_tag: %s" % epoch_tag)

-    tags_of_concern = [unmerged_tag for unmerged_tag in unmerged_tags if LooseVersion(unmerged_tag) > LooseVersion(epoch_tag)]
+    tags_of_concern = [tag for tag in unmerged_tags if LooseVersion(tag) > LooseVersion(epoch_tag)]
+
+    # Don't reverse integrate tags for adhoc builds
+    tags_of_concern = [tag for tag in tags_of_concern if "adhoc" not in tag]

    if len(tags_of_concern) > 0:
        logging.debug("Found unmerged tags newer than epoch: %s" % tags_of_concern)