summaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-05-19 10:25:14 +0200
committerJohn MacFarlane <jgm@berkeley.edu>2017-05-19 10:25:14 +0200
commit4aefbb3a1142644d346350d5849dab8c0c1445dd (patch)
tree5c97f0291f21ba06fb5e9a5103b1820f714e6820 /appveyor.yml
parent7a09b7b21dbbee34332047d07eae88fe152340b8 (diff)
appveyor.yml improvements.
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml33
1 files changed, 16 insertions, 17 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 19401ec88..a07868b38 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,17 +1,17 @@
-clone_folder: "c:\\stack"
+clone_folder: 'c:\pandoc'
environment:
- global:
- STACK_ROOT: "c:\\sr"
- STACK_YAML: "c:\\stack\\stack.pkg.yaml"
- WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.10\\bin"
matrix:
- STACK_VERSION: 'windows-i386'
- - STACK_VERSION: 'windows-x86_64'
+ STACK_ROOT: 'c:\sr32'
+ STACK: '%STACK_ROOT%\stack.exe'
+ WIXBIN: 'c:\Program Files (x86)\WiX Toolset v3.10\bin'
+ STACK_YAML: 'c:\pandoc\stack.pkg.yaml'
cache:
- - "c:\\sr" # stack root, short paths == fewer problems
- - "c:\\stack\\stack.exe"
- - '%WIXBIN%'
+ - '"%STACK_ROOT%"'
+ - '"%WIXBIN%"'
+ # This is where stack install ghc by default:
+ - 'c:\Users\appveyor\AppData\Local\Programs\stack'
# We don't do a normal C build, but build in test_script via stack
build: off
@@ -19,19 +19,18 @@ build: off
install:
- '"%WIXBIN%"\candle -? || choco install wixtoolset'
- |
- stack --version || curl -ostack.zip -L --insecure http://www.stackage.org/stack/%STACK_VERSION% && 7z x stack.zip stack.exe
- - stack setup > nul
+ %STACK% --version || curl -ostack.zip -L --insecure http://www.stackage.org/stack/%STACK_VERSION% && 7z x stack.zip stack.exe
-before_test:
- # the stack install already fails without the templates...
- - git submodule update --init
+# before_test:
test_script:
# The ugly echo "" hack is to avoid complaints about 0 being an invalid file
# descriptor
- - echo "" | stack clean
- - echo "" | stack -j1 --no-terminal test
- - echo "" | stack -j1 --local-bin-path=.\windows install pandoc pandoc-citeproc
+ - |
+ %STACK% setup > nul
+ %STACK% path
+ echo "" | %STACK% clean
+ echo "" | %STACK% -j1 --no-terminal --test --local-bin-path=.\windows install pandoc pandoc-citeproc
after_test:
# .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)