aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-03 13:41:48 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-06-03 13:41:48 -0700
commitdc0ade35131905dcb379d063ddf37ad3b6fee3e6 (patch)
treed2865e94ec6460aa0b011791ba306f023c1fb4b8
parent4177dbef6617a76f3c988f966cdb2a2a81ce0c46 (diff)
downloadpandoc-dc0ade35131905dcb379d063ddf37ad3b6fee3e6.tar.gz
Use windows/stack.yaml for appveyor build.
Use released pandoc-citeproc, not git.
-rw-r--r--appveyor.yml12
-rw-r--r--stack.yaml7
-rw-r--r--windows/stack-appveyor.yaml26
-rw-r--r--windows/stack.yaml6
4 files changed, 10 insertions, 41 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 36037069b..c23e9be5a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,12 +2,12 @@ clone_folder: "c:\\stack"
environment:
global:
STACK_ROOT: "c:\\sr"
- STACK_YAML: "c:\\stack\\windows\\stack-appveyor.yaml"
+ STACK_YAML: "c:\\stack\\windows\\stack.yaml"
WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.10\\bin"
cache:
- "c:\\sr" # stack root, short paths == fewer problems
- - '%LOCALAPPDATA%\Programs\stack' # even less to install...
+ - "c:\\stack\\stack.exe"
- '%WIXBIN%'
# We don't do a normal C build, but build in test_script via stack
@@ -15,8 +15,8 @@ build: off
install:
- '"%WIXBIN%"\candle -? || choco install wixtoolset'
- - curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
- - 7z x stack.zip stack.exe
+ - |
+ stack --version || curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386 && 7z x stack.zip stack.exe
- stack setup > nul
before_test:
@@ -25,14 +25,10 @@ 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
- - pwd
- - where stack
- echo "" | stack clean
- echo "" | stack --no-terminal test
- echo "" | stack --local-bin-path . install pandoc pandoc-citeproc
diff --git a/stack.yaml b/stack.yaml
index 108e40f27..a8a71f47e 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -8,11 +8,6 @@ flags:
packages:
- '.'
extra-deps:
-- texmath-0.8.6.2
- data-default-0.6.0
- data-default-instances-base-0.1.0
-# to compile against aeson 0.11.0.0:
-# - 'aeson-0.11.0.0'
-# - 'fail-4.9.0.0'
-# - 'pandoc-types-1.16.1'
-resolver: lts-5.8
+resolver: lts-6.1
diff --git a/windows/stack-appveyor.yaml b/windows/stack-appveyor.yaml
deleted file mode 100644
index 049494db8..000000000
--- a/windows/stack-appveyor.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-flags:
- pandoc:
- trypandoc: false
- https: true
- embed_data_files: true
- old-locale: false
- network-uri: true
- pandoc-citeproc:
- bibutils: true
- embed_data_files: true
- texmath:
- network-uri: true
-packages:
-- '..'
-extra-deps:
-- 'hsb2hs-0.3.1'
-- 'texmath-0.8.6.2'
-- 'data-default-0.6.0'
-- 'data-default-instances-base-0.1.0'
-- 'preprocessor-tools-1.0.1'
-- 'pandoc-citeproc-0.9.1.1'
-# to compile against aeson 0.11.0.0:
-# - 'aeson-0.11.0.0'
-# - 'fail-4.9.0.0'
-# - 'pandoc-types-1.16.1'
-resolver: lts-5.8
diff --git a/windows/stack.yaml b/windows/stack.yaml
index e4bf74347..0dfb77ce4 100644
--- a/windows/stack.yaml
+++ b/windows/stack.yaml
@@ -15,6 +15,10 @@ flags:
network-uri: true
packages:
- '..'
-- '../pandoc-citeproc'
extra-deps:
+- 'hsb2hs-0.3.1'
+- 'data-default-0.6.0'
+- 'data-default-instances-base-0.1.0'
+- 'preprocessor-tools-1.0.1'
+- 'pandoc-citeproc-0.9.1.1'
resolver: lts-6.1