@@ -4,6 +4,8 @@ environment:
5 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
5 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
6 STACK_BUILD_OPTS: "--no-terminal -j1 --no-system-ghc --install-ghc --test --local-bin-path=.\\windows"
6 STACK_BUILD_OPTS: "--no-terminal -j1 --no-system-ghc --install-ghc --test --local-bin-path=.\\windows"
8+ CABAL_PACKAGE_DB: "%CABAL_STORE%\\ghc-%GHC_MINOR_VERSION%\\package.db"
7 # Override the temp directory to avoid sed escaping issues
9 # Override the temp directory to avoid sed escaping issues
8 # See https://github.com/haskell/cabal/issues/5386
10 # See https://github.com/haskell/cabal/issues/5386
9 TMP: "c:\\tmp"
11 TMP: "c:\\tmp"
@@ -32,7 +34,6 @@ environment:
32 GHC_MINOR_VERSION: "8.6.1"
34 GHC_MINOR_VERSION: "8.6.1"
33 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
35 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
34 CABAL_VERSION: "2.4.0.0"
36 CABAL_VERSION: "2.4.0.0"
35− CABAL_STORE: "C:\\cs"
36 CABAL_OPTS: "--allow-newer -fembed_data_files -fbibutils"
37 CABAL_OPTS: "--allow-newer -fembed_data_files -fbibutils"
37 GHC_OPTS: "-fhide-source-paths"
38 GHC_OPTS: "-fhide-source-paths"
38 ARCH: "x64"
39 ARCH: "x64"
@@ -43,7 +44,6 @@ environment:
43 GHC_MINOR_VERSION: "8.6.1"
44 GHC_MINOR_VERSION: "8.6.1"
44 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
45 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
45 CABAL_VERSION: "2.4.0.0"
46 CABAL_VERSION: "2.4.0.0"
46− CABAL_STORE: "C:\\cs"
47 CABAL_OPTS: "--allow-newer -flua_32bits -fembed_data_files -fbibutils"
47 CABAL_OPTS: "--allow-newer -flua_32bits -fembed_data_files -fbibutils"
48 GHC_OPTS: "-fhide-source-paths"
48 GHC_OPTS: "-fhide-source-paths"
49 ARCH: "x86"
49 ARCH: "x86"
@@ -100,7 +100,7 @@ test_script:
100 # see https://github.com/haskell/cabal/issues/5516
100 # see https://github.com/haskell/cabal/issues/5516
101 - if "%BUILD_TYPE%" == "cabal" (
101 - if "%BUILD_TYPE%" == "cabal" (
102 cabal --version &&
102 cabal --version &&
103− mkdir "%CABAL_STORE%"/ghc-%GHC_MINOR_VERSION%/package.db &&
103+ if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" ) &&
104 cabal --store-dir="%CABAL_STORE%" new-update &&
104 cabal --store-dir="%CABAL_STORE%" new-update &&
105 cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests --run-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc &&
105 cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests --run-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc &&
106 forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
106 forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"