@@ -5,6 +5,7 @@ environment:
5 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
5 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
6 CABAL_STORE: "C:\\cs"
6 CABAL_STORE: "C:\\cs"
7 CABAL_PACKAGE_DB: "%CABAL_STORE%\\ghc-%GHC_MINOR_VERSION%\\package.db"
7 CABAL_PACKAGE_DB: "%CABAL_STORE%\\ghc-%GHC_MINOR_VERSION%\\package.db"
8+ CABAL: 'cabal --store-dir="%CABAL_STORE%"'
8 # Override the temp directory to avoid sed escaping issues
9 # Override the temp directory to avoid sed escaping issues
9 # See https://github.com/haskell/cabal/issues/5386
10 # See https://github.com/haskell/cabal/issues/5386
10 TMP: "c:\\tmp"
11 TMP: "c:\\tmp"
@@ -63,10 +64,12 @@ test_script:
63 # Note: we manually create cabal store, because of a cabal bug:
64 # Note: we manually create cabal store, because of a cabal bug:
64 # see https://github.com/haskell/cabal/issues/5516
65 # see https://github.com/haskell/cabal/issues/5516
65 - if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" )
66 - if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" )
66− - cabal --version
67+ - %CABAL% --version
67− - cabal --store-dir="%CABAL_STORE%" new-update
68+ - %CABAL% new-update
68− - cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
70+ - %CABAL% new-configure -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
69− - cabal --store-dir="%CABAL_STORE%" new-test
71+ - %CABAL% new-build . pandoc-citeproc
72+ - %CABAL% new-test . pandoc-citeproc
70 - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
73 - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
72after_test:
75after_test: