aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-09-26 23:37:29 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2018-09-26 23:37:29 -0700
commit3fb99b078f5f838657be8e8b1f518dfd6f104177 (patch)
tree5ca0ffca18344e8ae73a3cfef479d25fef9d0522
parent4461134b146051e0f3fe8a4b0787d0953709ce47 (diff)
downloadpandoc-3fb99b078f5f838657be8e8b1f518dfd6f104177.tar.gz
More appveyor improvements.
-rw-r--r--appveyor.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 3429b0023..b26de66da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
CABAL_STORE: "C:\\cs"
CABAL_PACKAGE_DB: "%CABAL_STORE%\\ghc-%GHC_MINOR_VERSION%\\package.db"
+ CABAL: 'cabal --store-dir="%CABAL_STORE%"'
# Override the temp directory to avoid sed escaping issues
# See https://github.com/haskell/cabal/issues/5386
TMP: "c:\\tmp"
@@ -63,10 +64,12 @@ test_script:
# Note: we manually create cabal store, because of a cabal bug:
# see https://github.com/haskell/cabal/issues/5516
- if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" )
- - cabal --version
- - cabal --store-dir="%CABAL_STORE%" new-update
- - cabal --store-dir="%CABAL_STORE%" new-build -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
- - cabal --store-dir="%CABAL_STORE%" new-test
+ - %CABAL% --version
+ - %CABAL% new-update
+ - %CABAL% new-clean
+ - %CABAL% new-configure -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
+ - %CABAL% new-build . pandoc-citeproc
+ - %CABAL% new-test . pandoc-citeproc
- forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
after_test: