@@ -3,33 +3,27 @@ clone_folder: "c:\\pandoc"
33environment:
44 global:
55 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
6− STACK_BUILD_OPTS: "--no-terminal -j1 --no-terminal --test --local-bin-path=.\\windows"
6+ STACK_BUILD_OPTS: "--no-terminal -j1 --no-system-ghc --install-ghc --test --local-bin-path=.\\windows"
7+ # Override the temp directory to avoid sed escaping issues
8+ # See https://github.com/haskell/cabal/issues/5386
9+ TMP: "c:\\tmp"
710 # see #4201, https://github.com/haskell-tools/haskell-tools/issues/277
811 matrix:
9− - STACK_VERSION: "windows-i386"
10− STACK_ROOT: "c:\\sr32"
11− STACK_YAML: "stack.lts11.yaml"
12− STACK: "%STACK_ROOT%\\stack.exe"
13− STACK_FLAGS: "--flag=hslua:lua_32bits"
14− ARCH: "x86"
1512 - STACK_VERSION: "windows-x86_64"
1613 STACK_ROOT: "c:\\sr64"
17− STACK_YAML: "stack.lts11.yaml"
18− STACK: "%STACK_ROOT%\\stack.exe"
19− STACK_FLAGS: ""
14+ STACK_YAML: "stack.yaml"
15+ STACK_FLAGS: "--arch=x86_64"
2016 ARCH: "x64"
17+ CHOCO_OPTS: ""
2118 - STACK_VERSION: "windows-i386"
2219 STACK_ROOT: "c:\\sr32"
23− STACK_YAML: "stack.yaml"
24− STACK: "%STACK_ROOT%\\stack.exe"
25− STACK_FLAGS: "--flag=hslua:lua_32bits"
20+ STACK_YAML: "stack.lts11.yaml"
21+ STACK_FLAGS: "--arch=i386 --flag=hslua:lua_32bits"
2622 ARCH: "x86"
27− - STACK_VERSION: "windows-x86_64"
28− STACK_ROOT: "c:\\sr64"
29− STACK_YAML: "stack.yaml"
30− STACK: "%STACK_ROOT%\\stack.exe"
31− STACK_FLAGS: ""
32− ARCH: "x64"
23+ CHOCO_OPTS: "--x86"
24+ # note: we do a lts11 build because of
25+ # https://github.com/commercialhaskell/stackage/issues/3385
26+ # with luck this will be fixed in ghc 8.6.
3327
3428skip_commits:
3529 files:
@@ -46,7 +40,6 @@ matrix:
4640
4741cache:
4842 - "%STACK_ROOT%"
49− - "%WIXBIN%"
5043 # This is where stack install ghc by default, but we don't
5144 # cache it because it's too large:
5245 # - "c:\\Users\\appveyor\\AppData\\Local\\Programs\\stack"
@@ -58,9 +51,8 @@ cache:
5851build: off
5952
6053install:
61− - '"%WIXBIN%"\candle -? || choco install wixtoolset'
62− - |
63− %STACK% --version || curl -ostack.zip -L --insecure http://www.stackage.org/stack/%STACK_VERSION% && 7z e stack.zip -o"%STACK_ROOT%" stack.exe
54+ - choco install wixtoolset %CHOCO_OPTS%
55+ - choco install haskell-stack %CHOCO_OPTS%
6456
6557# before_test:
6658
@@ -68,10 +60,10 @@ test_script:
6860 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
6961 # descriptor
7062 - |
71− %STACK% setup --stack-yaml %STACK_YAML% > nul
72− %STACK% path
73− echo "" | %STACK% clean
74− echo "" | %STACK% install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% pandoc pandoc-citeproc %STACK_FLAGS%
63+ stack --version
64+ stack path
65+ echo "" | stack clean
66+ echo "" | stack install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% %STACK_FLAGS% pandoc pandoc-citeproc
7567
7668after_test:
7769 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
@@ -84,8 +76,8 @@ after_test:
8476 set VERSION=
8577 for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" )
8678 echo %VERSION%
87− "%WIXBIN%\\candle" -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\
88− "%WIXBIN%\\light" -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%STACK_VERSION%.msi" wixobj\*.wixobj
79+ "%WIXBIN%"\candle -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\
80+ "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%STACK_VERSION%.msi" wixobj\*.wixobj
8981
9082artifacts:
9183 - path: 'windows\pandoc-%STACK_VERSION%.zip'