git.iko.soy/typeable/pandoc
on master help sign in
Use windows/stack.yaml for appveyor build.

Use released pandoc-citeproc, not git.

commitdc0ade35131905dcb379d063ddf37ad3b6fee3e6 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 3 Jun 2016, 13:41 (10 years ago) parent4177dbe
4 files changed+10−41
compare with master
unifiedsplit
appveyor.yml+4−8 stack.yaml+1−6 windows/stack-appveyor.yaml−26 windows/stack.yaml+5−1
appveyor.yml+4−8
@@ -2,12 +2,12 @@ clone_folder: "c:\\stack"
22environment:
33 global:
44 STACK_ROOT: "c:\\sr"
5− STACK_YAML: "c:\\stack\\windows\\stack-appveyor.yaml"
5+ STACK_YAML: "c:\\stack\\windows\\stack.yaml"
66 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.10\\bin"
77
88cache:
99 - "c:\\sr" # stack root, short paths == fewer problems
10− - '%LOCALAPPDATA%\Programs\stack' # even less to install...
10+ - "c:\\stack\\stack.exe"
1111 - '%WIXBIN%'
1212
1313# We don't do a normal C build, but build in test_script via stack
@@ -15,8 +15,8 @@ build: off
1515
1616install:
1717 - '"%WIXBIN%"\candle -? || choco install wixtoolset'
18− - curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
19− - 7z x stack.zip stack.exe
18+ - |
19+ stack --version || curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386 && 7z x stack.zip stack.exe
2020 - stack setup > nul
2121
2222before_test:
@@ -25,14 +25,10 @@ before_test:
2525 # set PATH to where the hsb2hs binary is copied to
2626 - cmd: set "PATH=%PATH%;%APPDATA%\\local\\bin"
2727 - stack install hsb2hs
28− # we'll need this to create the MSI
29− - git clone https://github.com/jgm/pandoc-citeproc
3028
3129test_script:
3230 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
3331 # descriptor
34− - pwd
35− - where stack
3632 - echo "" | stack clean
3733 - echo "" | stack --no-terminal test
3834 - echo "" | stack --local-bin-path . install pandoc pandoc-citeproc
stack.yaml+1−6
@@ -8,11 +8,6 @@ flags:
88packages:
99- '.'
1010extra-deps:
11−- texmath-0.8.6.2
1211- data-default-0.6.0
1312- data-default-instances-base-0.1.0
14−# to compile against aeson 0.11.0.0:
15−# - 'aeson-0.11.0.0'
16−# - 'fail-4.9.0.0'
17−# - 'pandoc-types-1.16.1'
18−resolver: lts-5.8
13+resolver: lts-6.1
windows/stack-appveyor.yamldeleted−26
@@ -1,26 +0,0 @@
1−flags:
2− pandoc:
3− trypandoc: false
4− https: true
5− embed_data_files: true
6− old-locale: false
7− network-uri: true
8− pandoc-citeproc:
9− bibutils: true
10− embed_data_files: true
11− texmath:
12− network-uri: true
13−packages:
14−- '..'
15−extra-deps:
16−- 'hsb2hs-0.3.1'
17−- 'texmath-0.8.6.2'
18−- 'data-default-0.6.0'
19−- 'data-default-instances-base-0.1.0'
20−- 'preprocessor-tools-1.0.1'
21−- 'pandoc-citeproc-0.9.1.1'
22−# to compile against aeson 0.11.0.0:
23−# - 'aeson-0.11.0.0'
24−# - 'fail-4.9.0.0'
25−# - 'pandoc-types-1.16.1'
26−resolver: lts-5.8
windows/stack.yaml+5−1
@@ -15,6 +15,10 @@ flags:
1515 network-uri: true
1616packages:
1717- '..'
18−- '../pandoc-citeproc'
1918extra-deps:
19+- 'hsb2hs-0.3.1'
20+- 'data-default-0.6.0'
21+- 'data-default-instances-base-0.1.0'
22+- 'preprocessor-tools-1.0.1'
23+- 'pandoc-citeproc-0.9.1.1'
2024resolver: lts-6.1