@@ -9,13 +9,13 @@ environment:
99 TMP: "c:\\tmp"
1010 # see #4201, https://github.com/haskell-tools/haskell-tools/issues/277
1111 matrix:
12− - BUILD_TYPE: "stack"
13− OSARCH: "windows-x86_64"
14− STACK_ROOT: "c:\\sr64"
15− STACK_YAML: "stack.yaml"
16− STACK_FLAGS: "--arch=x86_64"
17− ARCH: "x64"
18− CHOCO_OPTS: ""
12+# - BUILD_TYPE: "stack"
13+# OSARCH: "windows-x86_64"
14+# STACK_ROOT: "c:\\sr64"
15+# STACK_YAML: "stack.yaml"
16+# STACK_FLAGS: "--arch=x86_64"
17+# ARCH: "x64"
18+# CHOCO_OPTS: ""
1919# - BUILD_TYPE: "stack"
2020# OSARCH: "windows-i386"
2121# STACK_ROOT: "c:\\sr32"
@@ -29,6 +29,7 @@ environment:
2929 - BUILD_TYPE: "cabal"
3030 OSARCH: "windows-i386"
3131 GHC_VERSION: "8.6.1.1"
32+ CABAL_STORE: "C:\\cs"
3233 CABAL_BUILD_OPTS: "--allow-newer=base --allow-newer=template-haskell --allow-newer=containers -flua_32bits -fembed_data_files"
3334 ARCH: "x86"
3435 CHOCO_OPTS: "--x86"
@@ -48,6 +49,7 @@ matrix:
4849
4950cache:
5051 - "%STACK_ROOT%"
52+ - "%CABAL_STORE%"
5153 # This is where stack install ghc by default, but we don't
5254 # cache it because it's too large:
5355 # - "c:\\Users\\appveyor\\AppData\\Local\\Programs\\stack"
@@ -62,8 +64,9 @@ install:
6264 - choco install wixtoolset %CHOCO_OPTS%
6365 - if "%BUILD_TYPE%" == "stack" (
6466 choco install haskell-stack %CHOCO_OPTS%
65− ) else (
66− choco install ghc --version %GHC_VERSION% %CHOCO_OPTS%
67+ )
68+ - if "%BUILD_TYPE%" == "cabal" (
69+ choco install -y ghc --version %GHC_VERSION% --ignore-dependencies %CHOCO_OPTS%
6770 )
6871
6972# before_test:
@@ -79,8 +82,8 @@ test_script:
7982 )
8083 - if "%BUILD_TYPE%" == "cabal" (
8184 cabal --version &&
82− cabal update &&
83− cabal new-build %CABAL_BUILD_OPTS% . pandoc-citeproc &&
85+ cabal --store-dir="%CABAL_STORE%" new-update &&
86+ cabal --store-dir="%CABAL_STORE%" new-build %CABAL_BUILD_OPTS% . pandoc-citeproc &&
8487 forfiles /P .\dist-newstyle /M pandoc*.exe /C "cmd /C cp @file .\windows\ "
8588 )
8689