diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-03-28 10:19:52 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-03-28 10:19:52 -0700 |
| commit | b87a3efb93a7354c53117fa4ba6d43d2b5746ee9 (patch) | |
| tree | c06822f15032a4d2c30ab115bf9d8af71230823b | |
| parent | 33476b30f9fbba76d260cd985754a37df197febc (diff) | |
| download | pandoc-b87a3efb93a7354c53117fa4ba6d43d2b5746ee9.tar.gz | |
Revert "appveyor - just build dependencies."
This reverts commit f520c4dfbb1c63123a9a088d560d16dee8e0d686.
| -rw-r--r-- | appveyor.yml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/appveyor.yml b/appveyor.yml index 3e12d0b9f..55e41a76b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,31 +66,31 @@ test_script: - if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" ) - cabal --store-dir="%CABAL_STORE%" --version - cabal --store-dir="%CABAL_STORE%" new-update - - cabal --store-dir="%CABAL_STORE%" new-configure -w %GHC% --enable-tests --dependencies-only %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc - - cabal --store-dir="%CABAL_STORE%" new-build --dependencies-only . pandoc-citeproc -# - cabal --store-dir="%CABAL_STORE%" new-test . pandoc-citeproc -# - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows" + - cabal --store-dir="%CABAL_STORE%" new-configure -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc + - cabal --store-dir="%CABAL_STORE%" new-build . pandoc-citeproc + - cabal --store-dir="%CABAL_STORE%" new-test . pandoc-citeproc + - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows" after_test: # create msi and zip artifacts - cd windows -# - .\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html -# - .\pandoc.exe -s ..\COPYING.md -o COPYING.rtf -# - copy ..\COPYRIGHT COPYRIGHT.txt -# - 7z a "pandoc-%OSARCH%.zip" pandoc.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf -# - | -# set VERSION= -# for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" ) -# echo %VERSION% -# "%WIXBIN%"\candle -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\ -# "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%OSARCH%.msi" wixobj\*.wixobj + - .\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html + - .\pandoc.exe -s ..\COPYING.md -o COPYING.rtf + - copy ..\COPYRIGHT COPYRIGHT.txt + - 7z a "pandoc-%OSARCH%.zip" pandoc.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf + - | + set VERSION= + for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" ) + echo %VERSION% + "%WIXBIN%"\candle -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\ + "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%OSARCH%.msi" wixobj\*.wixobj # for debugging # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) artifacts: -# - path: 'windows\pandoc-%OSARCH%.zip' -# name: exe -# - path: 'windows\pandoc-%OSARCH%.msi' -# name: msi + - path: 'windows\pandoc-%OSARCH%.zip' + name: exe + - path: 'windows\pandoc-%OSARCH%.msi' + name: msi |