@@ -3,7 +3,6 @@ clone_folder: "c:\\pandoc"
33environment:
44 global:
55 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"
76 CABAL_STORE: "C:\\cs"
87 CABAL_PACKAGE_DB: "%CABAL_STORE%\\ghc-%GHC_MINOR_VERSION%\\package.db"
98 # Override the temp directory to avoid sed escaping issues
@@ -11,25 +10,7 @@ environment:
1110 TMP: "c:\\tmp"
1211 # see #4201, https://github.com/haskell-tools/haskell-tools/issues/277
1312 matrix:
14−# - BUILD_TYPE: "stack"
15−# OSARCH: "windows-x86_64"
16−# STACK_ROOT: "c:\\sr64"
17−# STACK_YAML: "stack.yaml"
18−# STACK_FLAGS: "--arch=x86_64"
19−# ARCH: "x64"
20−# CHOCO_OPTS: ""
21−# - BUILD_TYPE: "stack"
22−# OSARCH: "windows-i386"
23−# STACK_ROOT: "c:\\sr32"
24−# STACK_YAML: "stack.lts11.yaml"
25−# STACK_FLAGS: "--arch=i386 --flag=hslua:lua_32bits"
26−# ARCH: "x86"
27−# CHOCO_OPTS: "--x86"
28−# # note: we do a lts11 build because of
29−# # https://github.com/commercialhaskell/stackage/issues/3385
30−# # with luck this will be fixed in ghc 8.6.
31− - BUILD_TYPE: "cabal"
32− OSARCH: "windows-x86_64"
13+ - OSARCH: "windows-x86_64"
3314 GHC_VERSION: "8.6.1.1"
3415 GHC_MINOR_VERSION: "8.6.1"
3516 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
@@ -38,8 +19,7 @@ environment:
3819 GHC_OPTS: "-fhide-source-paths"
3920 ARCH: "x64"
4021 CHOCO_OPTS: ""
41− - BUILD_TYPE: "cabal"
42− OSARCH: "windows-i386"
22+ - OSARCH: "windows-i386"
4323 GHC_VERSION: "8.6.1.1"
4424 GHC_MINOR_VERSION: "8.6.1"
4525 GHC: "C:\\ProgramData\\chocolatey\\lib\\ghc\\tools\\ghc-%GHC_MINOR_VERSION%\\bin\\ghc.exe"
@@ -64,50 +44,33 @@ matrix:
6444
6545cache:
6646 - "%CABAL_STORE%"
67− # - "%STACK_ROOT%"
68− # This is where stack install ghc by default, but we don't
69− # cache it because it's too large:
70− # - "c:\\Users\\appveyor\\AppData\\Local\\Programs\\stack"
7147
7248# Note: to reset build cache, do the following in JavaScript
7349# console on appveyor:
7450# $.ajax({ url: 'https://ci.appveyor.com/api/projects/jgm/pandoc/buildcache', type: 'DELETE'})
75−# We don't do a normal C build, but build in test_script via stack
51+
52+# We don't do a normal C build, but build in test_script
7653build: off
7754
7855install:
7956 - choco install wixtoolset --version 3.11.1 %CHOCO_OPTS%
80− - if "%BUILD_TYPE%" == "stack" (
81− choco install haskell-stack %CHOCO_OPTS%
82− )
83− - if "%BUILD_TYPE%" == "cabal" (
84− choco install ghc --version %GHC_VERSION% --ignore-dependencies %CHOCO_OPTS% &&
85− choco install cabal --version %CABAL_VERSION% --ignore-dependencies %CHOCO_OPTS%
86− )
57+ - choco install ghc --version %GHC_VERSION% --ignore-dependencies %CHOCO_OPTS%
58+ - choco install cabal --version %CABAL_VERSION% --ignore-dependencies %CHOCO_OPTS%
8759
8860# before_test:
8961
9062test_script:
91− # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
92− # descriptor
93− - if "%BUILD_TYPE%" == "stack" (
94− stack --version &&
95− stack path &&
96− echo "" | stack clean &&
97− echo "" | stack install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% %STACK_FLAGS% pandoc pandoc-citeproc
98− )
9963 # Note: we manually create cabal store, because of a cabal bug:
10064 # see https://github.com/haskell/cabal/issues/5516
101− - if "%BUILD_TYPE%" == "cabal" (
102− cabal --version &&
103− if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" ) &&
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 &&
106− forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
107− )
65+ - if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" )
66+ - cabal --version
67+ - cabal --store-dir="%CABAL_STORE%" new-update
68+ - cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
69+ - cabal --store-dir="%CABAL_STORE%" new-test -w %GHC% %CABAL_OPTS% . pandoc-citeproc
70+ - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
10871
10972after_test:
110− # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
73+ # create msi and zip artifacts
11174 - cd windows
11275 - .\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html
11376 - .\pandoc.exe -s ..\COPYING.md -o COPYING.rtf