From f05090688b4559d830df777baa184af4cc25a3fc Mon Sep 17 00:00:00 2001
From: Russel Waters <vaelstrom@gmail.com>
Date: Sun, 29 Jul 2018 09:46:42 -0400
Subject: [PATCH] Appveyor Fixes (#1009)

* Appveyor Fixes

Fixed Pull Request building
Configured Build matrix for Live and Beta
Updated for MSVC 2017 build environment

* Docker deployment

Stop trying to deploy docker unless in nanocurrency/raiblocks repo

* typo :/

* Update deploy-docker.sh

* Update deploy-docker.sh

remove travis changes, will redo in another branch
---
 appveyor.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ab7930e6..f8b4792e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,19 +1,23 @@
 version: 1.0.{build}
-image: Visual Studio 2015
 pull_requests:
   do_not_increment_build_number: true
+skip_branch_with_pr: true
+max_jobs: 2
+image: Visual Studio 2017
 configuration: Release
 platform: x64
+environment:
+  matrix:
+    - network: rai_live_network
+    - network: rai_beta_network
 clone_folder: C:\projects\myproject
-init:
-- cmd: git config --global core.autocrlf input
-clone_script:
-- cmd: "git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% \ncd %APPVEYOR_BUILD_FOLDER%\ngit checkout -q %APPVEYOR_REPO_COMMIT%\ngit submodule update --init --recursive"
 install:
 - cmd: >-
     SET GIT_COMMIT=%APPVEYOR_REPO_COMMIT:~0,3%
 
-    cmake -DRAIBLOCKS_GUI=ON -DQt5_DIR="C:\Qt\5.9\msvc2015_64\lib\cmake\Qt5" -DRAIBLOCKS_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc140" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.0" -G "Visual Studio 14 2015 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib" -DGIT_COMMIT=%GIT_COMMIT%
+    git submodule update --init --recursive
+
+    cmake -DRAIBLOCKS_GUI=ON -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DRAIBLOCKS_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib" -DGIT_COMMIT=%GIT_COMMIT%
 
 - ps: >-
     $size_t=select-string -path ".\bootstrap_weights.cpp" -Pattern "rai_bootstrap_weights_size"| foreach {$_.Line}
@@ -29,10 +33,10 @@ install:
     select-string -path ".\rai\node\node.cpp" -Pattern $old_size_t -SimpleMatch | %{$curpath=$_.path; (get-content $curpath -Raw) -replace $old_size_t, $size_t| Out-File $curpath}
 
 - ps: Invoke-WebRequest -Uri https://download.microsoft.com/download/5/7/b/57b2947c-7221-4f33-b35e-2fc78cb10df4/vc_redist.x64.exe -OutFile .\vc_redist.x64.exe
-
 build:
-  parallel: true
   project: INSTALL.vcxproj
+  parallel: true
+  verbosity: minimal
 after_build:
 - cmd: >-
     cpack -NSIS --verbose
@@ -40,6 +44,6 @@ after_build:
     7z a nano.zip %APPVEYOR_BUILD_FOLDER%\Release\*.exe
 artifacts:
 - path: nano.zip
-  name: nano_release
+  name: nano_release_%network%
 - path: Nano_Installer-*.exe
-  name: Nano_installer
+  name: Nano_Installer_%network%
\ No newline at end of file