From d6bef0b74b76bed90f46bb041e08c85a0991dda7 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Tue, 11 Aug 2020 12:23:35 +0100
Subject: [PATCH] #6743 Set git commit on windows and mac

---
 CI/Linux/linux-build.yml     |  2 --
 CI/MacOS/mac-build.yml       | 12 ++----------
 CI/Windows/windows-build.yml |  4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml
index 91d5d9f0ba..9e73e17c2e 100644
--- a/CI/Linux/linux-build.yml
+++ b/CI/Linux/linux-build.yml
@@ -59,8 +59,6 @@ steps:
     condition: eq(variables['Build.Reason'], 'Manual')
 
   - script: |
-      export SYNERGY_REVISION=`git rev-parse --short=8 HEAD`
-      echo $SYNERGY_REVISION
       dch --create --package "synergy" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release"
       export DEB_BUILD_OPTIONS="parallel=8"
       export GPG_TTY=$(tty)
diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml
index 10b779d713..59ae5f3afa 100644
--- a/CI/MacOS/mac-build.yml
+++ b/CI/MacOS/mac-build.yml
@@ -6,14 +6,6 @@ steps:
       keychain: 'temp'
     condition: eq(variables['Build.Reason'], 'Manual')
 
-  - task: AzureKeyVault@1
-    inputs:
-      azureSubscription: 'Free Trial (796b9556-9614-41a6-8040-0eb14d81fe6f'
-      KeyVaultName: 'Symless'
-      SecretsFilter: '*'
-    displayName: "Get keys"
-    condition: eq(variables['Build.Reason'], 'Manual')
-
   - task: CmdLine@2
     inputs:
       script: 'brew install qt'
@@ -29,7 +21,7 @@ steps:
     displayName: 'Cmake standard'
     condition: eq(variables['buildType'], 'standard')
     env:
-      SYNERGY_REVISION: $(Build.SourceVersion)
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: CmdLine@2
     inputs:
@@ -42,7 +34,7 @@ steps:
     displayName: 'Cmake enterprise'
     condition: eq(variables['buildType'], 'enterprise')
     env:
-      SYNERGY_REVISION: $(Build.SourceVersion)
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: CmdLine@2
     inputs:
diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml
index a98832441a..01591abe4a 100644
--- a/CI/Windows/windows-build.yml
+++ b/CI/Windows/windows-build.yml
@@ -57,7 +57,7 @@ steps:
       BONJOUR_SDK_DIR: $(BONJOUR_SDK_DIR)
       QT_PATH: $(QT_BIN_PATH)
       MSARCH: 'x64'
-      SYNERGY_REVISION: $(Build.SourceVersion)
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       call "%ENV_BAT%" -arch=x64
@@ -85,7 +85,7 @@ steps:
       BONJOUR_SDK_DIR: $(BONJOUR_SDK_DIR)
       QT_PATH: $(QT_BIN_PATH_32)
       MSARCH: 'Win32'
-      SYNERGY_REVISION: $(Build.SourceVersion)
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       call "%ENV_BAT%" -arch=x86