Merge branch 'charlesmchen/riCheckIgnores'

7 years ago · 1a3e4c750e
parent 348642ebd6 d8c0f67569
commit 1a3e4c750e
1 changed files with 3 additions and 0 deletions
--- a/Scripts/reverse_integration_check.py
+++ b/Scripts/reverse_integration_check.py
@ -39,6 +39,9 @@ def main():
    # Don't reverse integrate tags for adhoc builds
    tags_of_concern = [tag for tag in tags_of_concern if "adhoc" not in tag]

+    tags_to_ignore = ['2.23.3.0', '2.23.3.1', '2.26.0.15', '2.26.0.16', '2.26.0.6', '2.26.0.7', '3.0', '3.0.1', '3.0.2']
+    tags_of_concern = [tag for tag in tags_of_concern if tag not in tags_to_ignore]
+
    if len(tags_of_concern) > 0:
        logging.debug("Found unmerged tags newer than epoch: %s" % tags_of_concern)
        raise RuntimeError("💥 Found unmerged tags: %s" % tags_of_concern)