From f832d99b26234e7eb09f5c3c8d3d038a89728868 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Thu, 9 Jul 2020 11:15:18 +0100
Subject: [PATCH 1/2] Added Windows core upload without condition.

---
 CI/Windows/windows-build.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml
index 79c60ae47..93367b4b3 100644
--- a/CI/Windows/windows-build.yml
+++ b/CI/Windows/windows-build.yml
@@ -137,6 +137,28 @@ steps:
     displayName: "Signing installers"
     condition: eq(variables['Build.Reason'], 'Manual')
 
+  - task: ArchiveFiles@2
+    inputs:
+      rootFolderOrFile: 'build32\bin\Release'
+      includeRootFolder: false
+      archiveType: 'zip'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/Synergy_x86.zip'
+      replaceExistingArchive: true
+      verbose: true
+    displayName: "Archive 32-bit binaries"
+#    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - task: ArchiveFiles@2
+    inputs:
+      rootFolderOrFile: 'build64\bin\Release'
+      includeRootFolder: false
+      archiveType: 'zip'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/Synergy_x64.zip'
+      replaceExistingArchive: true
+      verbose: true
+    displayName: "Archive 64-bit binaries"
+#    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
   - script: |
       call ./build64/version
       set SYNERGY_VERSION=%SYNERGY_VERSION_MAJOR%.%SYNERGY_VERSION_MINOR%.%SYNERGY_VERSION_PATCH%
@@ -160,6 +182,16 @@ steps:
     displayName: "Rename files"
     condition: eq(variables['Build.Reason'], 'Manual')
 
+  - task: CopyFilesOverSSH@0
+    inputs:
+      sshEndpoint: 'Azure on Sandor'
+      sourceFolder: '$(Build.ArtifactStagingDirectory)/'
+      contents: '*.zip'
+      targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/$(SYNERGY_REVISION)/'
+      readyTimeout: '20000'
+    displayName: 'Send archives to sandor'
+#    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
   - task: CopyFilesOverSSH@0
     inputs:
       sshEndpoint: 'Azure on Sandor'

From c0ea5e94de016ed227e5c06bee8df3e43bcd7b07 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Thu, 9 Jul 2020 11:43:34 +0100
Subject: [PATCH 2/2] Activated Conditions

---
 CI/Windows/windows-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml
index 93367b4b3..1be653dc5 100644
--- a/CI/Windows/windows-build.yml
+++ b/CI/Windows/windows-build.yml
@@ -146,7 +146,7 @@ steps:
       replaceExistingArchive: true
       verbose: true
     displayName: "Archive 32-bit binaries"
-#    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
   - task: ArchiveFiles@2
     inputs:
@@ -157,7 +157,7 @@ steps:
       replaceExistingArchive: true
       verbose: true
     displayName: "Archive 64-bit binaries"
-#    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
   - script: |
       call ./build64/version
@@ -190,7 +190,7 @@ steps:
       targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/$(SYNERGY_REVISION)/'
       readyTimeout: '20000'
     displayName: 'Send archives to sandor'
-#    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
   - task: CopyFilesOverSSH@0
     inputs: