[tor-commits] [tor/maint-0.3.4] Appveyor CI: Generate correct tag names

[nickm at torproject.org]

commit 965a910abf62523e72c50f216fba15b1395fc03d
Author: teor <teor at torproject.org>
Date:   Tue Jul 31 11:47:33 2018 +1000

    Appveyor CI: Generate correct tag names
    
    Part of 26979.
---
 scripts/test/appveyor-irc-notify.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py
index eb4d26ba3..b06534c3f 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -26,7 +26,7 @@
 # Modified by teor in 2018:
 #  - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
 #  - make short commits 10 hexdigits long (that's what git does for tor)
-#  - generate correct branches and URLs for pull requests
+#  - generate correct branches and URLs for pull requests and tags
 #  - switch to one URL per line
 
 # This program is free software; you can redistribute it and/or modify it under the
@@ -113,7 +113,8 @@ def appveyor_vars():
                 'APPVEYOR_REPO_COMMIT_MESSAGE',
                 'APPVEYOR_ACCOUNT_NAME',
                 'APPVEYOR_PULL_REQUEST_NUMBER',
-                'APPVEYOR_REPO_NAME'
+                'APPVEYOR_REPO_NAME',
+                'APPVEYOR_REPO_TAG_NAME',
             ]
     ])
 
@@ -122,7 +123,11 @@ def appveyor_vars():
     )
 
     BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}'
-    BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
+
+    if vars["repo_tag_name"]:
+        BRANCH_FMT = u'{repo_name} {repo_tag_name} {short_commit}'
+    else:
+        BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
     if vars["repo_provider"].lower().startswith('github'):
         COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'