From 4428746eb0205e258b96f2d603ec0ac2ce5ab741 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Tue, 22 Sep 2020 11:25:16 +0100
Subject: [PATCH 1/2] #6771 Stopped parallel builds and added u16 to workers

For some reason Ubuntu 16 didn't like running in parallel and as azure doesn't git
many core disabling multicore building doesn't affect the time that much
---
 CI/Linux/linux-build.yml | 2 --
 azure-pipelines.yml      | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml
index 285e7af43..e1c7b7546 100644
--- a/CI/Linux/linux-build.yml
+++ b/CI/Linux/linux-build.yml
@@ -66,7 +66,6 @@ steps:
 
   - script: |
       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_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir standard_package
@@ -87,7 +86,6 @@ steps:
   - 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_* --preserve-envvar GIT_COMMIT -us -uc
       mkdir enterprise_package
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 704b275c0..07eaf1aea 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,6 +10,10 @@ jobs:
 
     strategy:
       matrix:
+        ubuntu1604:
+          image: symless/synergy-core:ubuntu16.04
+          packager: deb
+          name: ubuntu16
         ubuntu1804:
           image: symless/synergy-core:ubuntu18.04
           packager: deb

From 28bb941911c782bf71a2dc66f873dbc5314c89af Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Tue, 22 Sep 2020 12:49:59 +0100
Subject: [PATCH 2/2] #6771 Updated ChangeLog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index f805a4b48..f187e4c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Bug fixes:
 - #6758 Account name with space on windows causes synergy to error when starting
 - #6760 Synergy loses license when creating a System scope config
 - #6342 Updated copyright year in version to use build date
+- #6771 Added Ubuntu 16 to CI/CD
 
 Enhancements:
 - #6750 Integrate SonarCloud for static analysis and test coverage