From: teor <teor@torproject.org>
Date: Tue, 31 Jul 2018 02:14:40 +0000 (+1000)
Subject: Appveyor CI: always use HEAD for the short commit
X-Git-Tag: tor-0.3.5.1-alpha~174^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3fca338a2c63241497b64a9f997c28f17ef1b6a;p=thirdparty%2Ftor.git

Appveyor CI: always use HEAD for the short commit

Part of 26979.
---

diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py
index 639acc6ce6..cfe0afe7ae 100644
--- a/scripts/test/appveyor-irc-notify.py
+++ b/scripts/test/appveyor-irc-notify.py
@@ -118,10 +118,6 @@ def appveyor_vars():
             ]
     ])
 
-    vars.update(
-        short_commit=vars["repo_commit"][:10],
-    )
-
     BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}'
 
     if vars["repo_tag_name"]:
@@ -129,15 +125,20 @@ def appveyor_vars():
     else:
         BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
 
+    vars.update(head_commit=vars["repo_commit"])
+
     if vars["repo_provider"].lower().startswith('github'):
         COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
         if vars["pull_request_number"]:
+            vars.update(head_commit=vars["pull_request_head_commit"])
             BRANCH_FMT = u'{repo_name} {repo_branch} pull {pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
             COMMIT_FMT = u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
             PULL_FMT = u'https://github.com/{repo_name}/pull/{pull_request_number}'
             vars.update(pull_url=PULL_FMT.format(**vars))
         vars.update(commit_url=COMMIT_FMT.format(**vars))
 
+    vars.update(short_commit=vars["head_commit"][:10])
+
     vars.update(
         build_url=BUILD_FMT.format(**vars),
         branch_detail=BRANCH_FMT.format(**vars),