@@ -62,15 +62,13 @@ cache:
65− - choco install wixtoolset %CHOCO_OPTS%
65+ - choco install wixtoolset --version 3.11 %CHOCO_OPTS%
66 - if "%BUILD_TYPE%" == "stack" (
66 - if "%BUILD_TYPE%" == "stack" (
67− choco install haskell-stack %CHOCO_OPTS% &&
67+ choco install haskell-stack %CHOCO_OPTS%
70 - if "%BUILD_TYPE%" == "cabal" (
69 - if "%BUILD_TYPE%" == "cabal" (
71 choco install -y ghc --version %GHC_VERSION% --ignore-dependencies %CHOCO_OPTS% &&
70 choco install -y ghc --version %GHC_VERSION% --ignore-dependencies %CHOCO_OPTS% &&
72− choco install -y cabal --version %CABAL_VERSION% --ignore-dependencies %CHOCO_OPTS% &&
71+ choco install -y cabal --version %CABAL_VERSION% --ignore-dependencies %CHOCO_OPTS%
76# before_test:
74# before_test:
@@ -86,6 +84,8 @@ test_script:
87 - if "%BUILD_TYPE%" == "cabal" (
85 - if "%BUILD_TYPE%" == "cabal" (
88 cabal --version &&
86 cabal --version &&
89 cabal --store-dir="%CABAL_STORE%" new-update &&
89 cabal --store-dir="%CABAL_STORE%" new-update &&
90 cabal --store-dir="%CABAL_STORE%" new-build %CABAL_BUILD_OPTS% . pandoc-citeproc &&
90 cabal --store-dir="%CABAL_STORE%" new-build %CABAL_BUILD_OPTS% . pandoc-citeproc &&
91 forfiles /P .\dist-newstyle /M pandoc*.exe /C "cmd /C cp @file .\windows\ "
91 forfiles /P .\dist-newstyle /M pandoc*.exe /C "cmd /C cp @file .\windows\ "