Merge remote-tracking branch 'upstream/master' into jp

[winmerge-jp/winmerge-jp.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 7fad89b..b1d7739 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,22 @@
 version: 1.0.{build}\r
-configuration: Release Unicode\r
+image: Visual Studio 2017\r
+configuration: Release\r
 platform: x64\r
 shallow_clone: true\r
-build:\r
-  project: WinMerge.vs2015.sln\r
-  verbosity: minimal\r
+install:\r
+- ps: >-\r
+    Add-Content $ENV:UserProfile\Mercurial.ini "`r`n[extensions]`r`neol = "\r
+\r
+    (new-object net.webclient).DownloadFile('http://www.jrsoftware.org/download.php/is.exe#innosetup-6.0.3.exe', "$Env:APPVEYOR_BUILD_FOLDER/innosetup-6.0.3.exe")\r
+\r
+    & $Env:APPVEYOR_BUILD_FOLDER/innosetup-6.0.3.exe /verysilent /norestart /currentuser\r
+cache: \r
+- build/WinMergeDownloadDeps\r
+build_script:\r
+- cmd: >-\r
+    DownloadDeps.cmd\r
+\r
+    BuildAll.vs2017.cmd x64 -ci\r
 artifacts:\r
-- path: build/x64/MergeUnicodeRelease
\ No newline at end of file
+- path: build/Releases/*.exe\r
+- path: build/Releases/*.zip\r