Also capture ANNOUNCE from cygport into package metadata

TODO: Interaction with ';' delimiter used in the message format used by
AppVeyor backend may need attention. Maybe we can use a null as a
delimiter instead, or perhaps AppVeyor should generate JSON as well?

Author: jon-turney

analyze.py

@@ -29,7 +29,7 @@
 
 
 class PackageKind:
-    def __init__(self, kind=None, script='', depends=None, arches=None, tokens=None):
+    def __init__(self, kind=None, script='', depends=None, arches=None, tokens=None, announce=''):
         if depends is None:
             depends = set()
         if arches is None:
@@ -42,6 +42,7 @@ def __init__(self, kind=None, script='', depends=None, arches=None, tokens=None)
         self.depends = depends
         self.arches = arches
         self.tokens = tokens
+        self.announce = announce
 
 
 var_list = [
@@ -52,6 +53,7 @@ def __init__(self, kind=None, script='', depends=None, arches=None, tokens=None)
     'INHERITED',
     'RESTRICT',
     'SCALLYWAG',
+    'ANNOUNCE',
 ]
 var_values = {}
 
@@ -224,7 +226,9 @@ def analyze(repodir, default_tokens):
 
         depends.update(depends_from_inherits(inherited))
 
-        return PackageKind(kind='cygport', script=fn, depends=depends, arches=arches, tokens=tokens)
+        announce = get_var('ANNOUNCE', '')
+
+        return PackageKind(kind='cygport', script=fn, depends=depends, arches=arches, tokens=tokens, announce=announce)
 
     # if there's no cygport file, we look for a g-b-s style .sh file instead
     scripts = [m for m in files if re.search(r'\.sh$', m)]

carpetbag.py

@@ -63,7 +63,7 @@ def update_metadata(u):
 
         # sort, because it's important that 'arch' and 'artifacts' are in the same order!
         u.arch_list = ' '.join(sorted(u.artifacts.keys()))
-        conn.execute("UPDATE jobs SET arches = ?, artifacts = ? WHERE id = ?", (u.arch_list, ' '.join([u.artifacts[a] for a in sorted(u.artifacts.keys())]), u.buildnumber))
+        conn.execute("UPDATE jobs SET arches = ?, artifacts = ?, announce = ? WHERE id = ?", (u.arch_list, ' '.join([u.artifacts[a] for a in sorted(u.artifacts.keys())]), u.announce, u.buildnumber))
 
         if not hasattr(u, 'status'):
             u.status = 'build succeeded'

gh.py

@@ -63,6 +63,7 @@ def examine_run_artifacts(wfr_id, u):
                     u.reference = mj['REFERENCE']
                     u.maintainer = mj['MAINTAINER']
                     u.tokens = mj['TOKENS']
+                    u.announce = mj['ANNOUNCE']
 
             # remove tmpfile
             os.remove(tmpfile.name)

hook.cgi

@@ -66,6 +66,7 @@ def hook():
             arch = evars['ARCH'].replace('i686', 'x86')
             maintainer = evars['MAINTAINER']
             tokens = evars['TOKENS']
+            announce = evars['ANNOUNCE']
 
             if arch != 'skip':
                 if len(job['artifacts']):
@@ -83,6 +84,7 @@ def hook():
     u.reference = reference
     u.maintainer = maintainer
     u.tokens = tokens
+    u.announce = announce
     u.artifacts = artifacts
 
     carpetbag.update_status(u)

migrations.py

@@ -28,6 +28,9 @@
         if 'tokens' not in cols:
             cursor.execute("ALTER TABLE jobs ADD COLUMN tokens TEXT NOT NULL DEFAULT ''")
 
+        if 'announce' not in cols:
+            cursor.execute("ALTER TABLE jobs ADD COLUMN announce TEXT NOT NULL DEFAULT ''")
+
         print(cols)
 
         conn.execute("UPDATE jobs SET status = ? WHERE status = ?", ('build succeeded', 'succeeded'))

scallywag

@@ -22,6 +22,7 @@ args = parser.parse_args()
 
 if args.inputs:
     args_dict = json.loads(args.inputs)
+    logging.info('input args are %s' % (args_dict))
 else:
     args_dict = os.environ
 
@@ -32,7 +33,6 @@ commit = args_dict['COMMIT']
 reference = args_dict['REFERENCE']
 default_tokens = args_dict.get('DEFAULT_TOKENS', '')
 
-logging.info('input args are %s' % (args_dict))
 logging.info('package is %s' % (name))
 
 # make a directory for working with the package repo
@@ -90,6 +90,7 @@ data_items = {
     'MAINTAINER': maintainer,
     'REFERENCE': reference,
     'TOKENS': (' '.join(package.tokens)),
+    'ANNOUNCE': package.announce,
 }
 
 if 'APPVEYOR' in os.environ: