From 3a2a42b21f71da77b0b2df79699db491f27aeb40 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 23 Jul 2020 16:27:57 +0100 Subject: [PATCH] #6734 Fixed stage being output instead of revision Added Commit as env to linux builds Signed-off-by: Jamie Newbon --- CI/Linux/linux-build.yml | 8 ++++++++ CI/Windows/windows-build.yml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index dab817d0c..e2747beb9 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -6,6 +6,8 @@ steps: make -j condition: eq(variables['packager'],'deb') displayName: 'Build Release deb' + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-release @@ -17,6 +19,8 @@ steps: make -j condition: eq(variables['packager'],'rpm') displayName: 'Build Release rpm' + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-ent @@ -26,6 +30,8 @@ steps: make -j displayName: 'Build enterprise' condition: eq(variables['packager'],'deb') + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-ent @@ -37,6 +43,8 @@ steps: make -j condition: eq(variables['packager'],'rpm') displayName: 'Build enterprise rpm' + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | . ./build-release/version diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml index 6c99ed66e..2cad4870c 100644 --- a/CI/Windows/windows-build.yml +++ b/CI/Windows/windows-build.yml @@ -172,13 +172,13 @@ steps: - script: | cd $(Build.Repository.LocalPath)\build32\installer\bin\Release\ - set FILENAME=$(prefix)_v$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE)_$(Build.BuildNumber).$(SYNERGY_VERSION_STAGE)_windows_x86.msi + set FILENAME=$(prefix)_v$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE)_$(Build.BuildNumber).$(SYNERGY_REVISION)_windows_x86.msi ren "Synergy.msi" "%FILENAME%" $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe md5 %FILENAME% > %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha1 %FILENAME% >> %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha256 %FILENAME% >> %FILENAME%.checksum.txt cd $(Build.Repository.LocalPath)\build64\installer\bin\Release\ - set FILENAME=$(prefix)_v$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE)_$(Build.BuildNumber).$(SYNERGY_VERSION_STAGE)_windows_x64.msi + set FILENAME=$(prefix)_v$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE)_$(Build.BuildNumber).$(SYNERGY_REVISION)_windows_x64.msi ren "Synergy.msi" "%FILENAME%" $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe md5 %FILENAME% > %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha1 %FILENAME% >> %FILENAME%.checksum.txt