Fixing regex for package deployment.

dhermes · dhermes · commit 0ea82cf98988 · 2016-12-15T22:41:23.000-08:00
diff --git a/circle.yml b/circle.yml
@@ -24,7 +24,7 @@ general:
 
 deployment:
   release:
-    tag: /(([a-z]+)-)?([0-9]+)\.([0-9]+)\.([0-9]+)/
+    tag: /(([a-z]+)-)*([0-9]+)\.([0-9]+)\.([0-9]+)/
     owner: GoogleCloudPlatform
     commands:
       - pip install --upgrade twine
diff --git a/scripts/circleci_tagged_pkg.py b/scripts/circleci_tagged_pkg.py
@@ -24,7 +24,7 @@
 import sys
 
 
-RE_TXT = r'^((?P<pkg>[a-z]+)-)?([0-9]+)\.([0-9]+)\.([0-9]+)$'
+RE_TXT = r'^(?P<pkg>(([a-z]+)-)*)([0-9]+)\.([0-9]+)\.([0-9]+)$'
 TAG_RE = re.compile(RE_TXT)
 TAG_ENV = 'CIRCLE_TAG'
 ERROR_MSG = '%s env. var. not set' % (TAG_ENV,)
@@ -52,7 +52,7 @@ def main():
     if pkg_name is None:
         print(ROOT_DIR)
     else:
-        pkg_dir = pkg_name.replace('-', '_')
+        pkg_dir = pkg_name.rstrip('-').replace('-', '_')
         print(os.path.join(ROOT_DIR, pkg_dir))
 
 
