From 092fe9667670b5f9b73bae3f5f8d51b2c86e55cf Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Fri, 26 Oct 2018 17:24:09 +0500
Subject: [PATCH 1/3] app veyor: make it green again

---
 .appveyor.yml              |  6 ++----
 .ci/appveyor_afterbuild.sh | 12 ++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100755 .ci/appveyor_afterbuild.sh

diff --git a/.appveyor.yml b/.appveyor.yml
index 0a3706eb..9be85ff6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -52,8 +52,7 @@ for:
   build_script:
     - make package -C tmp
   after_build:
-    - sudo dpkg -i build/softether-vpn*.deb
-    - sudo systemctl restart softether-vpnserver
+    - .ci/appveyor_afterbuild.sh
   artifacts:
     - path: build/*.deb
       name: Ubuntu
@@ -66,8 +65,7 @@ for:
   build_script:
     - make package -C tmp
   after_build:
-    - sudo dpkg -i build/softether-vpn*.deb
-    - sudo systemctl restart softether-vpnserver
+    - .ci/appveyor_afterbuild.sh
   artifacts:
     - path: build/*.deb
       name: Ubuntu
diff --git a/.ci/appveyor_afterbuild.sh b/.ci/appveyor_afterbuild.sh
new file mode 100755
index 00000000..f22759be
--- /dev/null
+++ b/.ci/appveyor_afterbuild.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -eux
+
+sudo dpkg -i build/softether-common*.deb
+sudo dpkg -i build/softether-vpnbridge*.deb
+sudo dpkg -i build/softether-vpnclient*.deb
+sudo dpkg -i build/softether-vpncmd*.deb
+sudo dpkg -i build/softether-vpnserver*.deb
+
+sudo systemctl restart softether-vpnserver
+

From 60acfae417ef47e7d4b1432cccb8588710404947 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Fri, 26 Oct 2018 17:24:37 +0500
Subject: [PATCH 2/3] gitlab-ci: drop 16.04 and 18.04 builds in favour of app
 veyor

---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bdef172..0c3a6cb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,14 +12,6 @@
     - make package -C tmp
     - dpkg -i build/softether-vpn*.deb
 
-bionic: 
-  <<: *ubuntu_def
-  image: ubuntu:bionic
-
-xenial:     
-  <<: *ubuntu_def
-  image: ubuntu:xenial
-
 trusty:      
   <<: *ubuntu_def
   image: ubuntu:trusty

From 8908f4a9330410db5a1e92518187e9ecece94a15 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Fri, 26 Oct 2018 17:31:55 +0500
Subject: [PATCH 3/3] app veyor: add "on_failure" linux script

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 9be85ff6..6f9fcffc 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -53,6 +53,8 @@ for:
     - make package -C tmp
   after_build:
     - .ci/appveyor_afterbuild.sh
+  on_failure:
+    - sudo journalctl -xe
   artifacts:
     - path: build/*.deb
       name: Ubuntu
@@ -66,6 +68,8 @@ for:
     - make package -C tmp
   after_build:
     - .ci/appveyor_afterbuild.sh
+  on_failure:
+    - sudo journalctl -xe
   artifacts:
     - path: build/*.deb
       name: Ubuntu