From 2eac2feed21c7291db630f1ccaa3a701b14d4b5b Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 4 Aug 2020 12:31:21 +0100 Subject: [PATCH 01/13] #6743 Added version calls prior to core build --- CI/Linux/linux-build.yml | 4 ++++ CI/MacOS/mac-build.yml | 7 +++++++ CI/Windows/windows-build.yml | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index e2747beb9..195fac7e9 100644 --- a/CI/Linux/linux-build.yml +++ b/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' diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index 0a77ac939..fba8f972f 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -28,6 +28,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 +41,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: diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml index 2cad4870c..01591abe4 100644 --- a/CI/Windows/windows-build.yml +++ b/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: From d1c0f6d3c0ba257d719ff98843a945cd8ccfd938 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 10 Aug 2020 10:43:29 +0100 Subject: [PATCH 02/13] #6743 Changed git commit to synergy version --- CI/Linux/linux-build.yml | 4 ++-- CI/MacOS/mac-build.yml | 4 ++-- CI/Windows/windows-build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 195fac7e9..1c555f222 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -8,7 +8,7 @@ steps: condition: eq(variables['packager'],'deb') displayName: 'Build Release deb' env: - GIT_COMMIT: $(Build.SourceVersion) + SYNERGY_REVISION: $(Build.SourceVersion) - script: | mkdir build-release @@ -22,7 +22,7 @@ steps: condition: eq(variables['packager'],'rpm') displayName: 'Build Release rpm' env: - GIT_COMMIT: $(Build.SourceVersion) + SYNERGY_REVISION: $(Build.SourceVersion) - script: | mkdir build-ent diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index fba8f972f..10b779d71 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -29,7 +29,7 @@ steps: displayName: 'Cmake standard' condition: eq(variables['buildType'], 'standard') env: - GIT_COMMIT: $(Build.SourceVersion) + SYNERGY_REVISION: $(Build.SourceVersion) - task: CmdLine@2 inputs: @@ -42,7 +42,7 @@ steps: displayName: 'Cmake enterprise' condition: eq(variables['buildType'], 'enterprise') env: - GIT_COMMIT: $(Build.SourceVersion) + SYNERGY_REVISION: $(Build.SourceVersion) - task: CmdLine@2 inputs: diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml index 01591abe4..a98832441 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' - GIT_COMMIT: $(Build.SourceVersion) + SYNERGY_REVISION: $(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' - GIT_COMMIT: $(Build.SourceVersion) + SYNERGY_REVISION: $(Build.SourceVersion) - script: | call "%ENV_BAT%" -arch=x86 From 295ac1d2e7f853c3c1a80863f2d3b2dbc3ad210c Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 10 Aug 2020 13:31:16 +0100 Subject: [PATCH 03/13] #6743 Trying out revision export before make --- CI/Linux/linux-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 1c555f222..88fd0efb0 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -4,6 +4,7 @@ steps: cd build-release if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi . ./version + export SYNERGY_REVISION=`git rev-parse --short=8 HEAD` make -j condition: eq(variables['packager'],'deb') displayName: 'Build Release deb' @@ -18,6 +19,7 @@ steps: else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..; fi . ./version + export SYNERGY_REVISION=`git rev-parse --short=8 HEAD` make -j condition: eq(variables['packager'],'rpm') displayName: 'Build Release rpm' From 52f1434004ee67ef04164d799801e4ed1c2c79df Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 10 Aug 2020 13:57:36 +0100 Subject: [PATCH 04/13] #6743 Limiting builds for faster testing --- azure-pipelines.yml | 184 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 704b275c0..79349378c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,34 +22,34 @@ jobs: image: symless/synergy-core:ubuntu20.04 packager: deb name: ubuntu20 - debian9: - image: symless/synergy-core:debian9 - packager: deb - name: debian9 - debian10: - image: symless/synergy-core:debian10 - packager: deb - name: debian10 - fedora28: - image: symless/synergy-core:fedora28 - packager: rpm - name: fedora28 - fedora29: - image: symless/synergy-core:fedora29 - packager: rpm - name: fedora29 - fedora30: - image: symless/synergy-core:fedora30 - packager: rpm - name: fedora30 - centos7.6: - image: symless/synergy-core:centos7.6 - packager: rpm - name: centos76 - centos8: - image: symless/synergy-core:centos8 - packager: rpm - name: centos8 +# debian9: +# image: symless/synergy-core:debian9 +# packager: deb +# name: debian9 +# debian10: +# image: symless/synergy-core:debian10 +# packager: deb +# name: debian10 +# fedora28: +# image: symless/synergy-core:fedora28 +# packager: rpm +# name: fedora28 +# fedora29: +# image: symless/synergy-core:fedora29 +# packager: rpm +# name: fedora29 +# fedora30: +# image: symless/synergy-core:fedora30 +# packager: rpm +# name: fedora30 +# centos7.6: +# image: symless/synergy-core:centos7.6 +# packager: rpm +# name: centos76 +# centos8: +# image: symless/synergy-core:centos8 +# packager: rpm +# name: centos8 container: $[ variables['image'] ] @@ -57,67 +57,67 @@ jobs: - template: CI/checkout.yml - template: CI/Linux/linux-build.yml - - job: MacOS - strategy: - matrix: - mojave-std: - image: macOS-10.14 - name: mojave - version: 10.12 - buildType: "standard" - prefix: "synergy" - mojave-ent: - image: macOS-10.14 - name: mojave - version: 10.12 - buildType: "enterprise" - prefix: "synergy-enterprise" - catalina-std: - image: macOS-10.15 - name: catalina - version: 10.14 - buildType: "standard" - prefix: "synergy" - catalina-ent: - image: macOS-10.15 - name: catalina - version: 10.14 - buildType: "enterprise" - prefix: "synergy-enterprise" - pool: - vmImage: $[ variables['image'] ] - - variables: - QT_PATH: '/usr/local/opt/qt/bin' - - steps: - - template: CI/checkout.yml - - template: CI/MacOS/mac-build.yml - - - job: Windows - strategy: - matrix: - vs2019: - image: windows-2019 - buildType: "standard" - prefix: "synergy" - vs2019ent: - image: windows-2019 - buildType: "enterprise" - prefix: "synergy_enterprise" - - pool: - vmImage: $[ variables['image'] ] - - variables: - QT_VERSION: '5.12.6' - QLI_OUT_DIR: '.\deps\Qt' - QLI_BASE_URL: 'http://qt.mirror.constant.com/' - QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64' - QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017' - BONJOUR_SDK_DIR: 'deps\BonjourSDK' - ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd' - - steps: - - template: CI/checkout.yml - - template: CI/Windows/windows-build.yml +# - job: MacOS +# strategy: +# matrix: +# mojave-std: +# image: macOS-10.14 +# name: mojave +# version: 10.12 +# buildType: "standard" +# prefix: "synergy" +# mojave-ent: +# image: macOS-10.14 +# name: mojave +# version: 10.12 +# buildType: "enterprise" +# prefix: "synergy-enterprise" +# catalina-std: +# image: macOS-10.15 +# name: catalina +# version: 10.14 +# buildType: "standard" +# prefix: "synergy" +# catalina-ent: +# image: macOS-10.15 +# name: catalina +# version: 10.14 +# buildType: "enterprise" +# prefix: "synergy-enterprise" +# pool: +# vmImage: $[ variables['image'] ] +# +# variables: +# QT_PATH: '/usr/local/opt/qt/bin' +# +# steps: +# - template: CI/checkout.yml +# - template: CI/MacOS/mac-build.yml +# +# - job: Windows +# strategy: +# matrix: +# vs2019: +# image: windows-2019 +# buildType: "standard" +# prefix: "synergy" +# vs2019ent: +# image: windows-2019 +# buildType: "enterprise" +# prefix: "synergy_enterprise" +# +# pool: +# vmImage: $[ variables['image'] ] +# +# variables: +# QT_VERSION: '5.12.6' +# QLI_OUT_DIR: '.\deps\Qt' +# QLI_BASE_URL: 'http://qt.mirror.constant.com/' +# QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64' +# QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017' +# BONJOUR_SDK_DIR: 'deps\BonjourSDK' +# ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd' +# +# steps: +# - template: CI/checkout.yml +# - template: CI/Windows/windows-build.yml From ba2736ea85a50029e521a8903a7b0ae8c1676297 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 10 Aug 2020 14:21:01 +0100 Subject: [PATCH 05/13] #6743 env set on package section --- CI/Linux/linux-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 88fd0efb0..234dcb79a 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -83,6 +83,8 @@ steps: ls -la displayName: "Package Binary DEB(Standard)" condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) + env: + SYNERGY_REVISION: $(Build.SourceVersion) - script: | export SYNERGY_ENTERPRISE=1 @@ -102,7 +104,9 @@ steps: ls -la displayName: "Package Binary DEB(Enterprise)" condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) - + env: + SYNERGY_REVISION: $(Build.SourceVersion) + - script: | cd build-release make install/strip From 086f31bf8dd2fca6bcd3c2b754398a497a7fa612 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 10 Aug 2020 16:33:45 +0100 Subject: [PATCH 06/13] #6743 exporting revision --- CI/Linux/linux-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 234dcb79a..d64444fa7 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -67,6 +67,7 @@ steps: condition: eq(variables['Build.Reason'], 'Manual') - script: | + export SYNERGY_REVISION=`git rev-parse --short=8 HEAD` dch --create --package "synergy" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release" export DEB_BUILD_OPTIONS="parallel=8" export GPG_TTY=$(tty) @@ -106,7 +107,7 @@ steps: condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) env: SYNERGY_REVISION: $(Build.SourceVersion) - + - script: | cd build-release make install/strip From 4a9c5f3d5330e6565e296434a4c12a07049eaf71 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 10 Aug 2020 16:43:53 +0100 Subject: [PATCH 07/13] #6743 exporting revision --- CI/Linux/linux-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index d64444fa7..ba152811a 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -68,6 +68,7 @@ steps: - 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) From 77891d91687850ecd11bcba38a182f4ff0a51626 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 11 Aug 2020 10:49:46 +0100 Subject: [PATCH 08/13] #6743 Set git commit and preserved env --- CI/Linux/linux-build.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index ba152811a..91d5d9f0b 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -8,8 +8,6 @@ steps: make -j condition: eq(variables['packager'],'deb') displayName: 'Build Release deb' - env: - SYNERGY_REVISION: $(Build.SourceVersion) - script: | mkdir build-release @@ -23,8 +21,6 @@ steps: make -j condition: eq(variables['packager'],'rpm') displayName: 'Build Release rpm' - env: - SYNERGY_REVISION: $(Build.SourceVersion) - script: | mkdir build-ent @@ -35,8 +31,6 @@ steps: make -j displayName: 'Build enterprise' condition: eq(variables['packager'],'deb') - env: - GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-ent @@ -49,8 +43,6 @@ steps: make -j condition: eq(variables['packager'],'rpm') displayName: 'Build enterprise rpm' - env: - GIT_COMMIT: $(Build.SourceVersion) - script: | . ./build-release/version @@ -72,7 +64,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) @@ -86,14 +78,14 @@ steps: displayName: "Package Binary DEB(Standard)" condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) env: - SYNERGY_REVISION: $(Build.SourceVersion) + 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) @@ -107,7 +99,7 @@ steps: displayName: "Package Binary DEB(Enterprise)" condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) env: - SYNERGY_REVISION: $(Build.SourceVersion) + GIT_COMMIT: $(Build.SourceVersion) - script: | cd build-release From 9d89a054271e2086230771cef0e831c97951dcc6 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 11 Aug 2020 11:14:44 +0100 Subject: [PATCH 09/13] #6743 Enabled all os's again --- azure-pipelines.yml | 184 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 79349378c..704b275c0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,34 +22,34 @@ jobs: image: symless/synergy-core:ubuntu20.04 packager: deb name: ubuntu20 -# debian9: -# image: symless/synergy-core:debian9 -# packager: deb -# name: debian9 -# debian10: -# image: symless/synergy-core:debian10 -# packager: deb -# name: debian10 -# fedora28: -# image: symless/synergy-core:fedora28 -# packager: rpm -# name: fedora28 -# fedora29: -# image: symless/synergy-core:fedora29 -# packager: rpm -# name: fedora29 -# fedora30: -# image: symless/synergy-core:fedora30 -# packager: rpm -# name: fedora30 -# centos7.6: -# image: symless/synergy-core:centos7.6 -# packager: rpm -# name: centos76 -# centos8: -# image: symless/synergy-core:centos8 -# packager: rpm -# name: centos8 + debian9: + image: symless/synergy-core:debian9 + packager: deb + name: debian9 + debian10: + image: symless/synergy-core:debian10 + packager: deb + name: debian10 + fedora28: + image: symless/synergy-core:fedora28 + packager: rpm + name: fedora28 + fedora29: + image: symless/synergy-core:fedora29 + packager: rpm + name: fedora29 + fedora30: + image: symless/synergy-core:fedora30 + packager: rpm + name: fedora30 + centos7.6: + image: symless/synergy-core:centos7.6 + packager: rpm + name: centos76 + centos8: + image: symless/synergy-core:centos8 + packager: rpm + name: centos8 container: $[ variables['image'] ] @@ -57,67 +57,67 @@ jobs: - template: CI/checkout.yml - template: CI/Linux/linux-build.yml -# - job: MacOS -# strategy: -# matrix: -# mojave-std: -# image: macOS-10.14 -# name: mojave -# version: 10.12 -# buildType: "standard" -# prefix: "synergy" -# mojave-ent: -# image: macOS-10.14 -# name: mojave -# version: 10.12 -# buildType: "enterprise" -# prefix: "synergy-enterprise" -# catalina-std: -# image: macOS-10.15 -# name: catalina -# version: 10.14 -# buildType: "standard" -# prefix: "synergy" -# catalina-ent: -# image: macOS-10.15 -# name: catalina -# version: 10.14 -# buildType: "enterprise" -# prefix: "synergy-enterprise" -# pool: -# vmImage: $[ variables['image'] ] -# -# variables: -# QT_PATH: '/usr/local/opt/qt/bin' -# -# steps: -# - template: CI/checkout.yml -# - template: CI/MacOS/mac-build.yml -# -# - job: Windows -# strategy: -# matrix: -# vs2019: -# image: windows-2019 -# buildType: "standard" -# prefix: "synergy" -# vs2019ent: -# image: windows-2019 -# buildType: "enterprise" -# prefix: "synergy_enterprise" -# -# pool: -# vmImage: $[ variables['image'] ] -# -# variables: -# QT_VERSION: '5.12.6' -# QLI_OUT_DIR: '.\deps\Qt' -# QLI_BASE_URL: 'http://qt.mirror.constant.com/' -# QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64' -# QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017' -# BONJOUR_SDK_DIR: 'deps\BonjourSDK' -# ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd' -# -# steps: -# - template: CI/checkout.yml -# - template: CI/Windows/windows-build.yml + - job: MacOS + strategy: + matrix: + mojave-std: + image: macOS-10.14 + name: mojave + version: 10.12 + buildType: "standard" + prefix: "synergy" + mojave-ent: + image: macOS-10.14 + name: mojave + version: 10.12 + buildType: "enterprise" + prefix: "synergy-enterprise" + catalina-std: + image: macOS-10.15 + name: catalina + version: 10.14 + buildType: "standard" + prefix: "synergy" + catalina-ent: + image: macOS-10.15 + name: catalina + version: 10.14 + buildType: "enterprise" + prefix: "synergy-enterprise" + pool: + vmImage: $[ variables['image'] ] + + variables: + QT_PATH: '/usr/local/opt/qt/bin' + + steps: + - template: CI/checkout.yml + - template: CI/MacOS/mac-build.yml + + - job: Windows + strategy: + matrix: + vs2019: + image: windows-2019 + buildType: "standard" + prefix: "synergy" + vs2019ent: + image: windows-2019 + buildType: "enterprise" + prefix: "synergy_enterprise" + + pool: + vmImage: $[ variables['image'] ] + + variables: + QT_VERSION: '5.12.6' + QLI_OUT_DIR: '.\deps\Qt' + QLI_BASE_URL: 'http://qt.mirror.constant.com/' + QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64' + QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017' + BONJOUR_SDK_DIR: 'deps\BonjourSDK' + ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd' + + steps: + - template: CI/checkout.yml + - template: CI/Windows/windows-build.yml From d6bef0b74b76bed90f46bb041e08c85a0991dda7 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 11 Aug 2020 12:23:35 +0100 Subject: [PATCH 10/13] #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 91d5d9f0b..9e73e17c2 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 10b779d71..59ae5f3af 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 a98832441..01591abe4 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 From b91c62910694c18722b65ff6c069cb3bd1adfca5 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 11 Aug 2020 12:47:33 +0100 Subject: [PATCH 11/13] #6743 Updated ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6f977e223..ddf3d2029 100644 --- a/ChangeLog +++ b/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 From 873c6cf45828edc872beeca40a4e3c582cfedaac Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 11 Aug 2020 13:19:38 +0100 Subject: [PATCH 12/13] #6743 Set git commit linux rpm --- CI/Linux/linux-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 9e73e17c2..e3ac82930 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -43,6 +43,8 @@ steps: make -j condition: eq(variables['packager'],'rpm') displayName: 'Build enterprise rpm' + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | . ./build-release/version @@ -114,6 +116,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 @@ -131,6 +135,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: From c32d6a0082208d27458f8c4a8103bae5b9ea235c Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 11 Aug 2020 13:54:54 +0100 Subject: [PATCH 13/13] #6743 Set git commit linux rpm --- CI/Linux/linux-build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index e3ac82930..285e7af43 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -4,10 +4,11 @@ steps: cd build-release if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi . ./version - export SYNERGY_REVISION=`git rev-parse --short=8 HEAD` make -j condition: eq(variables['packager'],'deb') displayName: 'Build Release deb' + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-release @@ -17,10 +18,11 @@ steps: else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..; fi . ./version - export SYNERGY_REVISION=`git rev-parse --short=8 HEAD` make -j condition: eq(variables['packager'],'rpm') displayName: 'Build Release rpm' + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-ent @@ -31,6 +33,8 @@ steps: make -j displayName: 'Build enterprise' condition: eq(variables['packager'],'deb') + env: + GIT_COMMIT: $(Build.SourceVersion) - script: | mkdir build-ent