From 0dbf288b95dbd204d0f3ce77b0d4c6705a051c69 Mon Sep 17 00:00:00 2001 From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Thu, 24 Dec 2020 18:41:51 +0300 Subject: [PATCH] SYNERGY-400 Make build for every merge (#6887) * SYNERGY-400 Generate build number and create release with tag * SYNERGY-400 Changes for Azure Piplines * Update ChangeLog * SYNERGY-400 Enable not manual build * SYNERGY-400 Removed extra space * SYNERGY-400 Removed extra bracket * SYNERGY-400 Correct conditions * SYNERGY-400 Fix additional condition * SYNERGY-400 Correct to run checks --- CI/Linux/linux-build.yml | 13 +++++-------- CI/MacOS/mac-build.yml | 12 ++++++------ CI/Windows/windows-build.yml | 8 ++------ azure-pipelines.yml | 10 +--------- 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 401c87d30e..f67ce5a221 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -67,7 +67,6 @@ steps: echo "##vso[task.setvariable variable=SYNERGY_DEB_VERSION]${SYNERGY_DEB_VERSION}" echo "##vso[task.setvariable variable=SYNERGY_RPM_VERSION]${SYNERGY_RPM_VERSION}" displayName: "Setup variables" - condition: eq(variables['Build.Reason'], 'Manual') - script: | dch --create --package "synergy" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release" @@ -84,7 +83,7 @@ steps: sha256sum $filename_new >> ${filename_new}.checksum.txt ls -la displayName: "Package Binary DEB(Standard)" - condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) + condition: eq(variables['packager'],'deb') env: GIT_COMMIT: $(Build.SourceVersion) @@ -104,7 +103,7 @@ steps: sha256sum $filename_new >> ${filename_new}.checksum.txt ls -la displayName: "Package Binary DEB(Enterprise)" - condition: and(eq(variables['packager'],'deb'), eq(variables['Build.Reason'], 'Manual')) + condition: eq(variables['packager'],'deb') env: GIT_COMMIT: $(Build.SourceVersion) @@ -122,7 +121,7 @@ steps: cd .. mv x86_64 $(Build.Repository.LocalPath)/standard_package displayName: "Package Binary RPM(standard)" - condition: and(eq(variables['packager'],'rpm'), eq(variables['Build.Reason'], 'Manual')) + condition: eq(variables['packager'],'rpm') env: GIT_COMMIT: $(Build.SourceVersion) @@ -141,7 +140,7 @@ steps: mv x86_64 $(Build.Repository.LocalPath)/enterprise_package ls -la displayName: "Package Binary RPM(enterprise)" - condition: and(eq(variables['packager'],'rpm'), eq(variables['Build.Reason'], 'Manual')) + condition: eq(variables['packager'],'rpm') env: GIT_COMMIT: $(Build.SourceVersion) @@ -153,7 +152,6 @@ steps: targetFolder: 'synergy-core/v1-core-standard/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' displayName: 'Send standard Package to sandor' - condition: eq(variables['Build.Reason'], 'Manual') - task: CopyFilesOverSSH@0 inputs: @@ -162,5 +160,4 @@ steps: contents: '*' targetFolder: 'synergy-core/v1-core-enterprise/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send enterprise Package to sandor' - condition: eq(variables['Build.Reason'], 'Manual') \ No newline at end of file + displayName: 'Send enterprise Package to sandor' \ No newline at end of file diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index cb774d528a..da8e7bc812 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -4,7 +4,12 @@ steps: certSecureFile: 'AppleSigningCert.cer' certPwd: '$(AppleCertPass)' keychain: 'temp' - condition: eq(variables['Build.Reason'], 'Manual') + + - task: CmdLine@2 + inputs: + script: | + python3 CI/build_version.py + displayName: 'Update Version.cmake' - task: CmdLine@2 inputs: @@ -71,7 +76,6 @@ steps: displayName: 'Signing' env: CODESIGN_ID: "Developer ID Application: Symless Ltd (4HX897Y6GJ)" - condition: eq(variables['Build.Reason'], 'Manual') - script: | . ./build/version @@ -86,7 +90,6 @@ steps: echo "##vso[task.setvariable variable=SYNERGY_DMG_VERSION]${SYNERGY_DMG_VERSION}" echo "##vso[task.setvariable variable=SYNERGY_DMG_FILENAME]${SYNERGY_DMG_FILENAME}" displayName: "Setup variables" - condition: eq(variables['Build.Reason'], 'Manual') - task: CmdLine@2 inputs: @@ -104,7 +107,6 @@ steps: shasum $(SYNERGY_DMG_FILENAME) >> $(SYNERGY_DMG_FILENAME).checksum.txt shasum -a 256 $(SYNERGY_DMG_FILENAME) >> $(SYNERGY_DMG_FILENAME).checksum.txt displayName: 'Create Installer' - condition: eq(variables['Build.Reason'], 'Manual') - task: Bash@3 inputs: @@ -114,7 +116,6 @@ steps: ASC_USERNAME: $(ASC_USERNAME) NOTORY_APP_PASSWORD: $(NOTORY_APP_PASSWORD) displayName: 'Submit for Notarization' - condition: eq(variables['Build.Reason'], 'Manual') - task: CopyFilesOverSSH@0 inputs: @@ -124,4 +125,3 @@ steps: targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' displayName: 'Send Package to sandor' - condition: eq(variables['Build.Reason'], 'Manual') diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml index fbe0995abe..091ac8ce03 100644 --- a/CI/Windows/windows-build.yml +++ b/CI/Windows/windows-build.yml @@ -109,7 +109,6 @@ steps: timeServer: 'http://timestamp.digicert.com' hashingAlgorithm: 'SHA256' displayName: "Signing Synergy binaries" - condition: eq(variables['Build.Reason'], 'Manual') - task: MSBuild@1 inputs: @@ -145,7 +144,6 @@ steps: timeServer: 'http://timestamp.digicert.com' hashingAlgorithm: 'SHA256' displayName: "Signing installers" - condition: eq(variables['Build.Reason'], 'Manual') - task: ArchiveFiles@2 inputs: @@ -179,7 +177,7 @@ steps: echo ##vso[task.setvariable variable=SYNERGY_VERSION]%SYNERGY_VERSION% echo ##vso[task.setvariable variable=SYNERGY_REVISION]%SYNERGY_REVISION% displayName: "Set Variables" - condition: or(eq(variables['Build.Reason'], 'Manual'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - script: | cd $(Build.Repository.LocalPath)\build32\installer\bin\Release\ @@ -195,7 +193,6 @@ steps: $(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 displayName: "Rename files" - condition: eq(variables['Build.Reason'], 'Manual') - task: CopyFilesOverSSH@0 inputs: @@ -215,7 +212,7 @@ steps: targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' displayName: 'Send x86 Package to sandor' - condition: eq(variables['Build.Reason'], 'Manual') + - task: CopyFilesOverSSH@0 inputs: @@ -225,4 +222,3 @@ steps: targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' displayName: 'Send x64 Package to sandor' - condition: eq(variables['Build.Reason'], 'Manual') diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 462df977fa..2da564a41b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,4 @@ +pr: none trigger: none jobs: @@ -7,9 +8,6 @@ jobs: pool: vmImage: 'ubuntu-16.04' - #As apparently the trigger set to none doesn't work - condition: eq(variables['Build.Reason'], 'Manual') - strategy: matrix: ubuntu1604: @@ -81,9 +79,6 @@ jobs: pool: vmImage: $[ variables['image'] ] - #As apparently the trigger set to none doesn't work - condition: eq(variables['Build.Reason'], 'Manual') - variables: QT_VERSION: '5.15.2' QT_PATH: '/usr/local/opt/qt' @@ -108,9 +103,6 @@ jobs: pool: vmImage: $[ variables['image'] ] - #As apparently the trigger set to none doesn't work - condition: eq(variables['Build.Reason'], 'Manual') - variables: QT_VERSION: '5.12.6' QLI_OUT_DIR: '.\deps\Qt'