From c00783b510fe185524aab8b6d15e0902848f20d3 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 3 Jun 2016 12:06:25 -0700 Subject: Windows build: create pandoc-citeproc on appveyor, so we can put in msi. Updated stackage resolver. --- appveyor.yml | 5 +++-- windows/stack.yaml | 7 ++----- 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 -- cgit v1.2.3