From eca2af03bf38739a834040491fc0e16c66ab0b6e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 30 May 2018 18:10:57 -0400 Subject: [PATCH 1/2] Ignore adhoc tags in reverse_integration_check // FREEBIE --- Scripts/reverse_integration_check.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Scripts/reverse_integration_check.py b/Scripts/reverse_integration_check.py index c366354ba..a5a02efb7 100755 --- 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) From ab2ecf2f2f5e5795463b82d19c5534b5491c7195 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 30 May 2018 18:12:34 -0400 Subject: [PATCH 2/2] make failure more obvious // FREEBIE --- Scripts/reverse_integration_check.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Scripts/reverse_integration_check.py b/Scripts/reverse_integration_check.py index a5a02efb7..9d64aa332 100755 --- a/Scripts/reverse_integration_check.py +++ b/Scripts/reverse_integration_check.py @@ -1,4 +1,5 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # When we make a hotfix, we need to reverse integrate our hotfix back into # master. After commiting to master, this script audits that all tags have been @@ -40,7 +41,7 @@ def main(): 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) + raise RuntimeError("💥 Found unmerged tags: %s" % tags_of_concern) else: logging.debug("No unmerged tags newer than epoch. All good!")