@@ -4,6 +4,8 @@ environment:
44 global:
55 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
66 STACK_BUILD_OPTS: "--no-terminal -j1 --no-system-ghc --install-ghc --test --local-bin-path=.\\windows"
7+ CABAL_STORE: "C:\\cs"
8+ CABAL_PACKAGE_DB: "%CABAL_STORE%\\ghc-%GHC_MINOR_VERSION%\\package.db"
79 # Override the temp directory to avoid sed escaping issues
810 # See https://github.com/haskell/cabal/issues/5386
911 TMP: "c:\\tmp"
@@ -32,7 +34,6 @@ environment:
3234 GHC_MINOR_VERSION: "8.6.1"
3335 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
3436 CABAL_VERSION: "2.4.0.0"
35− CABAL_STORE: "C:\\cs"
3637 CABAL_OPTS: "--allow-newer -fembed_data_files -fbibutils"
3738 GHC_OPTS: "-fhide-source-paths"
3839 ARCH: "x64"
@@ -43,7 +44,6 @@ environment:
4344 GHC_MINOR_VERSION: "8.6.1"
4445 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
4546 CABAL_VERSION: "2.4.0.0"
46− CABAL_STORE: "C:\\cs"
4747 CABAL_OPTS: "--allow-newer -flua_32bits -fembed_data_files -fbibutils"
4848 GHC_OPTS: "-fhide-source-paths"
4949 ARCH: "x86"
@@ -100,7 +100,7 @@ test_script:
100100 # see https://github.com/haskell/cabal/issues/5516
101101 - if "%BUILD_TYPE%" == "cabal" (
102102 cabal --version &&
103− mkdir "%CABAL_STORE%"/ghc-%GHC_MINOR_VERSION%/package.db &&
103+ if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" ) &&
104104 cabal --store-dir="%CABAL_STORE%" new-update &&
105105 cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests --run-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc &&
106106 forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"