@@ -29,17 +29,23 @@ environment:
29 - BUILD_TYPE: "cabal"
29 - BUILD_TYPE: "cabal"
30 OSARCH: "windows-x86_64"
30 OSARCH: "windows-x86_64"
31 GHC_VERSION: "8.6.1.1"
31 GHC_VERSION: "8.6.1.1"
32+ GHC_MINOR_VERSION: "8.6.1"
32− GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-8.6.1\\bin\\ghc.exe"
33+ GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
33 CABAL_VERSION: "2.4.0.0"
34 CABAL_VERSION: "2.4.0.0"
34 CABAL_STORE: "C:\\cs"
35 CABAL_STORE: "C:\\cs"
36+ CABAL_OPTS: "--allow-newer -fembed_data_files -fbibutils"
37+ GHC_OPTS: "-fhide-source-paths"
35 ARCH: "x64"
38 ARCH: "x64"
36 CHOCO_OPTS: ""
39 CHOCO_OPTS: ""
37 - BUILD_TYPE: "cabal"
40 - BUILD_TYPE: "cabal"
38 OSARCH: "windows-i386"
41 OSARCH: "windows-i386"
39 GHC_VERSION: "8.6.1.1"
42 GHC_VERSION: "8.6.1.1"
43+ GHC_MINOR_VERSION: "8.6.1"
40− GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-8.6.1\\bin\\ghc.exe"
44+ GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
41 CABAL_VERSION: "2.4.0.0"
45 CABAL_VERSION: "2.4.0.0"
42 CABAL_STORE: "C:\\cs"
46 CABAL_STORE: "C:\\cs"
47+ CABAL_OPTS: "--allow-newer -flua_32bits -fembed_data_files -fbibutils"
48+ GHC_OPTS: "-fhide-source-paths"
43 ARCH: "x86"
49 ARCH: "x86"
44 CHOCO_OPTS: "--x86"
50 CHOCO_OPTS: "--x86"
@@ -94,9 +100,9 @@ test_script:
94 # see https://github.com/haskell/cabal/issues/5516
100 # see https://github.com/haskell/cabal/issues/5516
95 - if "%BUILD_TYPE%" == "cabal" (
101 - if "%BUILD_TYPE%" == "cabal" (
96 cabal --version &&
102 cabal --version &&
97− mkdir "%CABAL_STORE%"/ghc-8.6.1/package.db &&
103+ mkdir "%CABAL_STORE%"/ghc-%GHC_MINOR_VERSION%/package.db &&
98 cabal --store-dir="%CABAL_STORE%" new-update &&
104 cabal --store-dir="%CABAL_STORE%" new-update &&
99− cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --allow-newer -flua_32bits -fembed_data_files . pandoc-citeproc &&
105+ cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests --run-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS" . pandoc-citeproc &&
100 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"