From a21c94c355e13a84d93fb322430afbdc3f4af2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Fri, 6 Nov 2020 15:31:25 +0100
Subject: [PATCH 1/5] CI: Add docker build

---
 .appveyor.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 103342f18..29edb7d0f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,11 +29,13 @@ environment:
                              -DDEBUG_OUTPUT=ON \
                              -DENABLE_EXTERNAL_LIBRARIES=ON \
                              -DBUILD_SERVER=OFF"
+    - TARGET: ubuntu2004docker
+      APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
 
 for:
   - matrix:
       only:
-        - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2019'
+        - TARGET: 'vs2019gui'
     cache:
       - C:\ProgramData\chocolatey\bin
       - C:\ProgramData\chocolatey\lib
@@ -63,7 +65,7 @@ for:
         branch: master            # release from master branch only
   - matrix:
       only:
-        - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
+        - TARGET: ubuntu2004prod
     cache:
       - $HOME/external/
     install:
@@ -117,3 +119,13 @@ for:
       on:
         APPVEYOR_REPO_TAG: true        # deploy on tag push only
         branch: master                 # release from master branch only
+  - matrix:
+      only:
+        - TARGET: ubuntu2004docker
+    before_build:
+      - git clone https://github.com/f4exb/sdrangel-docker.git
+      - cd sdrangel-docker
+    build_script:
+      - cd sdrangel
+      - ./build_vanilla.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
+      - ./build_server.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}

From ed7971afb8202a4a1367f1f36c6ede44df89b9a8 Mon Sep 17 00:00:00 2001
From: Edouard Griffiths <f4exb06@gmail.com>
Date: Sat, 7 Nov 2020 02:48:18 +0100
Subject: [PATCH 2/5] Use BYOC Linux machine for Docker image build

---
 .appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 29edb7d0f..5756d466c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,8 @@ environment:
                              -DENABLE_EXTERNAL_LIBRARIES=ON \
                              -DBUILD_SERVER=OFF"
     - TARGET: ubuntu2004docker
-      APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
+      APPVEYOR_BUILD_WORKER_CLOUD: nasrock
+      APPVEYOR_BUILD_WORKER_IMAGE: Linux
 
 for:
   - matrix:

From dce565c611b23f984465b6c3808b2315e3b238eb Mon Sep 17 00:00:00 2001
From: Edouard Griffiths <f4exb06@gmail.com>
Date: Sat, 7 Nov 2020 04:42:03 +0100
Subject: [PATCH 3/5] Try on_finish for BYOC build

---
 .appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 5756d466c..28e508f41 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -130,3 +130,5 @@ for:
       - cd sdrangel
       - ./build_vanilla.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
       - ./build_server.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
+    on_finish:
+      - sh: appveyor exit

From 8d3d8774a9ce4e2acd9e999fa62475a9d62651dd Mon Sep 17 00:00:00 2001
From: Edouard Griffiths <f4exb06@gmail.com>
Date: Sat, 7 Nov 2020 04:55:44 +0100
Subject: [PATCH 4/5] Try APPVEYOR_CONSOLE_DISABLE_PTY: true

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 28e508f41..d13006d89 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -32,6 +32,7 @@ environment:
     - TARGET: ubuntu2004docker
       APPVEYOR_BUILD_WORKER_CLOUD: nasrock
       APPVEYOR_BUILD_WORKER_IMAGE: Linux
+      APPVEYOR_CONSOLE_DISABLE_PTY: true
 
 for:
   - matrix:

From 779b8dc3911828753784eb4c01d95b4ad1a49554 Mon Sep 17 00:00:00 2001
From: Edouard Griffiths <f4exb06@gmail.com>
Date: Sat, 7 Nov 2020 05:06:57 +0100
Subject: [PATCH 5/5] Now remove on_finish

---
 .appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index d13006d89..9e3436010 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -131,5 +131,3 @@ for:
       - cd sdrangel
       - ./build_vanilla.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
       - ./build_server.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
-    on_finish:
-      - sh: appveyor exit