summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-03 12:06:25 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-06-03 12:06:25 -0700
commitc00783b510fe185524aab8b6d15e0902848f20d3 (patch)
treea7bb58b17218ef49b5451d1afd136126c1687c94
parent8f88a304dd95a8a79f0b03a558b97a12d8e07c3b (diff)
Windows build: create pandoc-citeproc on appveyor, so we can put in msi.
Updated stackage resolver.
-rw-r--r--appveyor.yml5
-rw-r--r--windows/stack.yaml7
2 files changed, 5 insertions, 7 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 1021e2666..d4eb46a6a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,13 +25,14 @@ before_test:
# set PATH to where the hsb2hs binary is copied to
- cmd: set "PATH=%PATH%;%APPDATA%\\local\\bin"
- stack install hsb2hs
-
+ # we'll need this to create the MSI
+ - git clone https://github.com/jgm/pandoc-citeproc
test_script:
# The ugly echo "" hack is to avoid complaints about 0 being an invalid file
# descriptor
- echo "" | stack --no-terminal test
- - echo "" | stack --local-bin-path . install pandoc
+ - echo "" | stack --local-bin-path . install pandoc pandoc-citeproc
after_test:
# .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
diff --git a/windows/stack.yaml b/windows/stack.yaml
index 22f127c8d..e4bf74347 100644
--- a/windows/stack.yaml
+++ b/windows/stack.yaml
@@ -15,9 +15,6 @@ flags:
network-uri: true
packages:
- '..'
-- '../../pandoc-citeproc'
+- '../pandoc-citeproc'
extra-deps:
-- 'aeson-0.11.1.1'
-- 'texmath-0.8.5'
-- 'highlighting-kate-0.6.2'
-resolver: lts-5.8
+resolver: lts-6.1