From 6c3fab84ecb95f213190574682ddc55fa3129e17 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Fri, 10 Jan 2020 17:43:29 -0500
Subject: [PATCH] update ci for windows installers

---
 .travis.yml | 40 ++++++++++++++++++++++++++++++++++++++++
 Makefile    |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e83f396b4..ab00ed36e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -117,6 +117,27 @@ matrix:
     dist: xenial
     env: DOCKER_FILE=docker/gcc-trunk.Dockerfile
     services: docker
+  - name: "native windows debug"
+    os: windows
+    env: BUILD_TYPE=Debug
+  - name: "native windows release"
+    os: windows
+    env: BUILD_TYPE=Release
+  - name: "windows installer"
+    os: linux
+    env: MAKE_TARGET=windows STATIC_LINK=ON DOWNLOAD_SODIUM=ON
+  allow_failures:
+  - name: "make windows docker image"
+    os: linux
+    dist: xenial
+    env: DOCKER_FILE=docker/alpine-windows.Dockerfile
+    services: docker
+  - name: "native windows debug"
+    os: windows
+    env: BUILD_TYPE=Debug
+  - name: "native windows release"
+    os: windows
+    env: BUILD_TYPE=Release
 #  - name: "native windows debug"
 #    os: windows
 #    env: BUILD_TYPE=Debug
@@ -137,6 +158,25 @@ env:
     - STATIC_LINK=OFF
 
 addons:
+  apt:
+    packages:
+    - binutils-gold
+    - build-essential
+    - clang-format
+    - cmake
+    - curl
+    - docker-ce
+    - nsis
+    - g++-mingw-w64
+    - g++-mingw-w64-x86-64
+    - gcc-mingw-w64-base
+    - git
+    - libcap-dev
+    - libcurl4-openssl-dev
+    - libuv1-dev
+    - mingw-w64 mingw-w64-common
+    - ninja-build
+    - libsodium-dev
   homebrew:
     update: true
     packages:
diff --git a/Makefile b/Makefile
index 93eed5566..cad85da99 100644
--- a/Makefile
+++ b/Makefile
@@ -285,7 +285,7 @@ windows-release: windows-release-configure
 	$(MAKE) -C '$(BUILD_ROOT)'
 	cd '$(BUILD_ROOT)' && cpack -D CPACK_MONOLITHIC_INSTALL=1 -G NSIS ..
 
-windows: windows-debug
+windows: windows-release
 
 abyss: debug
 	$(ABYSS_EXE)