Merge pull request #6746 from symless/issue-6743-git-revision

Fixed error with about page showing a bad commit hash

CI/Linux/linux-build.yml

@@ -3,6 +3,7 @@ steps:
       mkdir build-release
       cd build-release
       if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi
+      . ./version
       make -j
     condition: eq(variables['packager'],'deb')
     displayName: 'Build Release deb'
@@ -16,6 +17,7 @@ steps:
       cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
       else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
       fi
+      . ./version
       make -j
     condition: eq(variables['packager'],'rpm')
     displayName: 'Build Release rpm'
@@ -27,6 +29,7 @@ steps:
       cd build-ent
       export SYNERGY_ENTERPRISE=1
       if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; fi
+      . ./version
       make -j
     displayName: 'Build enterprise'
     condition: eq(variables['packager'],'deb')
@@ -40,6 +43,7 @@ steps:
       cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
       else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
       fi
+      . ./version
       make -j
     condition: eq(variables['packager'],'rpm')
     displayName: 'Build enterprise rpm'
@@ -64,7 +68,7 @@ steps:
       dch --create --package "synergy" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release"
       export DEB_BUILD_OPTIONS="parallel=8"
       export GPG_TTY=$(tty)
-      debuild --preserve-envvar SYNERGY_* -us -uc
+      debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir standard_package
       cd ..
       filename=$(ls synergy_*.deb)
@@ -77,13 +81,15 @@ steps:
       ls -la
     displayName: "Package Binary DEB(Standard)"
     condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual'))
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       export SYNERGY_ENTERPRISE=1
       dch --create --package "synergy-enterprise_" --controlmaint --distribution unstable --newversion $(SYNERGY_DEB_VERSION) "Initial release"
       export DEB_BUILD_OPTIONS="parallel=8"
       export GPG_TTY=$(tty)
-      debuild --preserve-envvar SYNERGY_* -us -uc
+      debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir enterprise_package
       cd ..
       filename=$(ls synergy_*.deb)
@@ -96,6 +102,8 @@ steps:
       ls -la
     displayName: "Package Binary DEB(Enterprise)"
     condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual'))
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       cd build-release
@@ -112,6 +120,8 @@ steps:
       mv x86_64 $(Build.Repository.LocalPath)/standard_package
     displayName: "Package Binary RPM(standard)"
     condition: and(eq(variables['packager'],'rpm'), eq(variables['Build.Reason'], 'Manual'))
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       cd build-release
@@ -129,6 +139,8 @@ steps:
       ls -la
     displayName: "Package Binary RPM(enterprise)"
     condition: and(eq(variables['packager'],'rpm'), eq(variables['Build.Reason'], 'Manual'))
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: CopyFilesOverSSH@0
     inputs:

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'
@@ -28,6 +20,8 @@ steps:
         cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=$(version) -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release ..
     displayName: 'Cmake standard'
     condition: eq(variables['buildType'], 'standard')
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: CmdLine@2
     inputs:
@@ -39,14 +33,19 @@ steps:
         cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DSYNERGY_ENTERPRISE=ON ..
     displayName: 'Cmake enterprise'
     condition: eq(variables['buildType'], 'enterprise')
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: CmdLine@2
     inputs:
       script: |
         cd build
+        . ./version
         make -j
         make install/strip
     displayName: 'Compiling'
+    env:
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: CmdLine@2
     inputs:

CI/Windows/windows-build.yml

@@ -57,14 +57,17 @@ steps:
       BONJOUR_SDK_DIR: $(BONJOUR_SDK_DIR)
       QT_PATH: $(QT_BIN_PATH)
       MSARCH: 'x64'
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       call "%ENV_BAT%" -arch=x64
       cd build64
+      call version
       msbuild synergy-core.sln /p:Platform="x64" /p:Configuration=Release
     displayName: 'Compiling x64'
     env:
       ENV_BAT: $(ENV_BAT)
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       call "%ENV_BAT%" -arch=x86
@@ -82,14 +85,17 @@ steps:
       BONJOUR_SDK_DIR: $(BONJOUR_SDK_DIR)
       QT_PATH: $(QT_BIN_PATH_32)
       MSARCH: 'Win32'
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - script: |
       call "%ENV_BAT%" -arch=x86
       cd build32
+      call version
       msbuild synergy-core.sln /p:Platform="Win32" /p:Configuration=Release
     displayName: 'Compiling x32'
     env:
       ENV_BAT: $(ENV_BAT)
+      GIT_COMMIT: $(Build.SourceVersion)
 
   - task: codesigning@2
     inputs:

ChangeLog

@@ -4,6 +4,7 @@ v1.12.0-rc2
 Bug fixes:
 - #6730 Updating synergy looses settings
 - #6734 Fixed naming of installers for linux and windows
+- #6743 Azure build git revision showing as 0badc0de
 
 Enhancements:
 - #6739 Add submodules cloning to cmake