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