Commit graph

180 commits

Author SHA1 Message Date
John MacFarlane
cf14c2be33 appveyor - another attempt. 2018-09-24 21:01:41 -07:00
John MacFarlane
34eac93240 Revert "appveyor: Try without echo "" hack."
This reverts commit 6315e8b6c3.
2018-09-24 15:57:46 -07:00
John MacFarlane
6315e8b6c3 appveyor: Try without echo "" hack. 2018-09-24 15:49:52 -07:00
John MacFarlane
9fa66d0b88 appveyor - fix typo. 2018-09-24 15:33:50 -07:00
John MacFarlane
7a9129ef48 appveyor - use ps. 2018-09-24 15:33:12 -07:00
John MacFarlane
a72aed27e2 appveyor.yml - another tweak. 2018-09-24 14:37:56 -07:00
John MacFarlane
dc062e3d31 appveyor.yml - fix env variables. 2018-09-24 14:04:56 -07:00
John MacFarlane
c307bfb953 appveyor.yml - use proper windows conditional syntax. 2018-09-24 12:45:38 -07:00
John MacFarlane
ee02820816 Fix appveyor.yaml env variable. 2018-09-24 12:19:42 -07:00
John MacFarlane
5bf5834104 appveyor.yml - try adding cabal 8.6.1.1 build. 2018-09-24 11:54:09 -07:00
John MacFarlane
ddac7434fc Clean up appveyor build.
We now use ghc 8.4.3, lts-12 for the 64-bit build.
We still use ghc 8.2, lts-11 for  the 32-bit build because
of blocking bugs:
https://github.com/commercialhaskell/stackage/issues/3385
With luck this will be fixed in ghc 8.6.

Get stack from chocolatey.

Use 32-bit stack for 32-bit builds, 64-bit for 64-bit.
2018-09-06 23:12:31 -07:00
John MacFarlane
952677a212 appveyor.yml : try building with lts-12. 2018-09-03 15:33:23 -07:00
John MacFarlane
7c0b314cbe appveyor.yml: use -arch with candle.
This may help with #4795.
2018-08-28 21:06:51 -07:00
John MacFarlane
385a0619ff Revert "appveyor.yml: use regular stack.yaml, not stack.lts11.yaml."
This reverts commit 0a93d33566.
2018-08-16 23:26:43 -07:00
John MacFarlane
0a93d33566 appveyor.yml: use regular stack.yaml, not stack.lts11.yaml. 2018-08-16 22:04:21 -07:00
John MacFarlane
582b4afd0e appveyor: fixed use of --stack-yaml. 2018-07-14 18:04:26 -07:00
John MacFarlane
482a5874e9 appveyor: try using lts-11. 2018-07-14 17:51:46 -07:00
John MacFarlane
4c0d056df1 Revert "appveyor - for diagnostics, try building just aeson-pretty..."
This reverts commit 6aa6fb2692.
2018-07-14 17:49:53 -07:00
John MacFarlane
6aa6fb2692 appveyor - for diagnostics, try building just aeson-pretty...
instead of pandoc-citeproc.
2018-07-14 17:20:47 -07:00
John MacFarlane
bc048c834a appveyor: try with stack --no-terminal, remove verbosity. 2018-07-14 14:00:17 -07:00
John MacFarlane
241bfd2ff3 appveyor: use right option to change verbosity. 2018-07-14 13:12:00 -07:00
John MacFarlane
7e1844cc1f appveyor: increase stack verbosity. 2018-07-14 13:05:13 -07:00
John MacFarlane
d8a0724c3f appveyor: revert build aeson-pretty first. 2018-07-14 11:28:45 -07:00
John MacFarlane
48d7443ca9 Fix aeson flag again... 2018-07-13 17:05:05 -07:00
John MacFarlane
073a5329e5 Fix appveyor flag. 2018-07-13 16:55:52 -07:00
John MacFarlane
2e7387697e appveyor: try building aeson-pretty first... 2018-07-13 16:39:31 -07:00
John MacFarlane
488320faac appveyor.yml - build 64 bit version and 32 bit. 2018-04-12 10:56:44 -07:00
John MacFarlane
93228d594e appveyor: use Visual Studio 2013 instead of 2015.
Perhaps this will help with #4283.
2018-03-12 10:26:26 -07:00
John MacFarlane
3193bf6be7 appveyor - remove -fexternal-interpreter.
This didn't help with the problem #4283.
2018-01-21 08:26:34 -08:00
John MacFarlane
06abfed8e1 appveyor - put comment about cache delete on one line,
so it's easier to copy/paste.
2018-01-21 08:20:39 -08:00
John MacFarlane
5e106ce0b8 More appveyor fixes. 2018-01-20 14:46:47 -08:00
John MacFarlane
e69ca9a070 appveyor - changed syntax for adding ghc-options. 2018-01-20 14:25:24 -08:00
John MacFarlane
d9dd9beda1 appveyor.yml : use -fexternal-interpreter.
This is supposed to help with the segfaults that come from
use of TH.  See #4021.
2018-01-20 10:38:17 -08:00
John MacFarlane
62bc894f9e Update appveyor to use stack.yaml. 2017-12-27 21:25:07 -08:00
John MacFarlane
62487bd69f appveyor.yml: added skip_commits. 2017-10-12 11:28:32 -07:00
John MacFarlane
0eb61ae5cb Revert "appveyor tweak - maybe this will help with the build issue."
This reverts commit c40768b28a.
2017-10-11 08:56:24 -07:00
John MacFarlane
c40768b28a appveyor tweak - maybe this will help with the build issue. 2017-10-11 08:53:21 -07:00
Albert Krewinkel
7a40f4865f Ensure hslua is build for 32 bits on windows i386
This prevents some otherwise hard to find and hard miscalculations in
lua filters.
2017-08-16 15:47:05 +02:00
John MacFarlane
01a15e8c50 Revert "appveyor.yml: don't use matrix."
This reverts commit d4ccd1e001.
2017-05-24 22:54:11 +02:00
John MacFarlane
d4ccd1e001 appveyor.yml: don't use matrix. 2017-05-24 22:06:40 +02:00
John MacFarlane
b847f65e84 appveyor: turn off 64-bit build for now. 2017-05-24 11:54:54 +02:00
John MacFarlane
7fba4e6a9c appveyor.yml: added fast_finish, fails if either job fails. 2017-05-24 11:41:05 +02:00
John MacFarlane
95c37d1e1f appveyor.yml - really fixed artifacts. 2017-05-19 18:40:14 +02:00
John MacFarlane
6c86e96f9b appveyor.yml - fix artifacts. 2017-05-19 18:15:49 +02:00
John MacFarlane
8560a693bb appveyor.yml: added comment with instructions to reset build cache. 2017-05-19 16:22:45 +02:00
John MacFarlane
d487176b58 Revert "appveyor.yml - reset cache when appveyor.yml changes."
This reverts commit 8ac2675c27.
2017-05-19 16:21:35 +02:00
John MacFarlane
8ac2675c27 appveyor.yml - reset cache when appveyor.yml changes. 2017-05-19 16:18:12 +02:00
John MacFarlane
7059f14982 Fixed appveyor.yml. 2017-05-19 15:17:08 +02:00
John MacFarlane
aa6a0bf192 appveyor.yml updates.
* Don't try to cache ghc, it's too big.
* Build both 32 and 64 bit versions.
2017-05-19 15:12:56 +02:00
John MacFarlane
0b34f80ffa appveyor.yml. Fix WINBIN path. 2017-05-19 11:56:44 +02:00
John MacFarlane
c5b1076302 appveyor.yml - put stack executable in stack_root. 2017-05-19 10:42:21 +02:00
John MacFarlane
48d23766a4 appveyor.yml fixes. 2017-05-19 10:29:50 +02:00
John MacFarlane
4aefbb3a11 appveyor.yml improvements. 2017-05-19 10:25:14 +02:00
John MacFarlane
118c8ddb91 Fixed appveyor.yml. 2017-05-18 23:00:59 +02:00
John MacFarlane
a70b26c310 appveyor: attempt two builds, one 32-bit, one 64-bit. 2017-05-18 22:56:57 +02:00
John MacFarlane
affc800c47 appveyor.yml: remove manual calls to editbin.
To really solve this memory limit, we need to build with
a 64-bit version of ghc.
2017-05-16 09:17:32 +02:00
John MacFarlane
1e2dc33165 appveyor.yml: proper editbin path both times... 2017-05-15 19:50:37 +02:00
John MacFarlane
a97f69066e Fixed appveyor.yml syntax error. 2017-05-15 19:35:46 +02:00
John MacFarlane
6f8940882a appveyor.yml: proper path for editbin.
I hope.
2017-05-15 19:27:15 +02:00
John MacFarlane
8e6ea699e9 appveyor.yml: Don't install hsb2hs.
We now use file-embed instead.
2017-05-15 19:26:37 +02:00
John MacFarlane
6ddf78b8a0 appveyor.yml: make executables LARGEADDRESSAWARE
using editbin, which comes with VisualStudio.

This should help with #3669 (needs testing).
Previously our executables could only access 2GB memory on Windows,
even in 64 bit systems with lots of memory.
2017-05-15 17:42:10 +02:00
John MacFarlane
c4c9374526 appveyor.yml: Fixed some paths. 2017-02-12 23:17:35 +01:00
John MacFarlane
ad2f80f91d appveyor.yml: use -j1, in hopes that this will help with a GHC bug.
The bug: https://ghc.haskell.org/trac/ghc/ticket/13194
See https://ci.appveyor.com/api/buildjobs/02l7v73n5hjs2t5u/log
for its occurrence in previous appveyor builds of pandoc.
2017-02-12 22:34:07 +01:00
John MacFarlane
cc75635bc9 Windows packaging fixes to use new stack.pkg.yaml. 2017-02-12 22:04:53 +01:00
John MacFarlane
cb79e9c28d Windows builds: removed -S option from pandoc invocations. 2017-01-30 11:49:25 +01:00
Kolen Cheung
4b51ed3823 Download markdown version of the license from GNU and rename to COPYING.md
From https://www.gnu.org/licenses/old-licenses/gpl-2.0.md
2016-10-19 04:11:36 -07:00
Albert Krewinkel
a396003a31 Rename README to MANUAL.txt 2016-07-20 21:16:45 +02:00
John MacFarlane
7ded9d4af0 Include table of contents in README.html in Windows package. 2016-06-26 17:24:15 -07:00
John MacFarlane
5ef8498618 appveyor: use improved method for creating msi. 2016-06-04 11:38:38 -07:00
John MacFarlane
dc0ade3513 Use windows/stack.yaml for appveyor build.
Use released pandoc-citeproc, not git.
2016-06-03 13:41:48 -07:00
John MacFarlane
4177dbef66 appveyor.yml: diagnostics. 2016-06-03 13:25:56 -07:00
John MacFarlane
c4ae3b9855 appveyor.yml: Fix check for existing wixtoolset. 2016-06-03 13:15:34 -07:00
John MacFarlane
920b575a23 appveyor improvements.
- Create pandoc.msi as artifact.
- Don't install wix unless we need to.
2016-06-03 12:37:54 -07:00
John MacFarlane
c00783b510 Windows build: create pandoc-citeproc on appveyor, so we can put in msi.
Updated stackage resolver.
2016-06-03 12:06:25 -07:00
John MacFarlane
8f88a304dd appveyor: Fixed spacing issue in VERSION setting. 2016-06-03 11:31:09 -07:00
John MacFarlane
ab55f956e4 appveyor: another attempt to get version set! 2016-06-03 10:49:30 -07:00
John MacFarlane
366b94d26b appveyor: another try at setting version. 2016-06-03 10:30:06 -07:00
John MacFarlane
9eb3dba243 appveyor: Fixed version detection. 2016-06-02 22:53:31 -07:00
John MacFarlane
9ea7c7f6ea appveyor: cache wixbin directory. 2016-06-02 22:11:20 -07:00
John MacFarlane
e916c05837 appveyor: maybe fixed escaping. 2016-06-02 22:09:25 -07:00
John MacFarlane
2bff4ad358 Fixed YAML for appveyor.yml. 2016-06-02 21:43:01 -07:00
John MacFarlane
703151c6bb appveyor: fixed set command. 2016-06-02 21:33:57 -07:00
John MacFarlane
ed561e9f93 appveyor: put wix path in quotes. 2016-06-02 21:32:35 -07:00
John MacFarlane
ef6b3b1b75 appveyor: another attempt to get wix paths right. 2016-06-02 21:31:24 -07:00
John MacFarlane
6b47a87d7d appveyor.yml: try to get paths for candle and light right. 2016-06-02 21:12:55 -07:00
John MacFarlane
4a11e0a450 appveyor: try to create msi as artifact. 2016-06-02 16:55:46 -07:00
Jan Schulz
92fad7be01 Better way to find the artifacts on appveyor 2016-05-13 01:33:16 +02:00
John MacFarlane
dd649f19a9 appveyor - enable automatic builds, fix zip creation. 2016-05-12 11:48:40 -07:00
Jan Schulz
7590d19445 Use windows stack.yaml on appveyor to embedded the templates 2016-05-11 23:51:26 +02:00
Jan Schulz
9a2be80722 Add appveyor artefacts for pandoc.exe 2016-05-10 23:14:05 +02:00
John MacFarlane
928a05073f Stack-based appveyor setup. 2016-03-07 09:16:39 -08:00
John MacFarlane
95201a0885 Revert "New approach to stack build on appveyor."
This reverts commit cdd6389e91.
2015-10-28 12:41:06 -07:00
John MacFarlane
cdd6389e91 New approach to stack build on appveyor.
This uses system lua library.
See https://github.com/osa1/hslua/issues/22#issuecomment-151281274
2015-10-28 11:01:38 -07:00
John MacFarlane
0abd0a4268 appveyor: don't cache HP or install wix toolset. 2015-10-07 15:20:20 -07:00
John MacFarlane
2e4c4575db appveyor.yml: back to cabal/HP based build.
Can't get stack build to work.

With 64 bit, we run into problems building hslua.
https://github.com/osa1/hslua/issues/22

With 32 bit, we run into problems with missing
symbol __mingw_vsprintf in building cmark.
2015-10-07 10:01:19 -07:00
John MacFarlane
6d3ad456a0 appveyor.yml - try with 32bit version of stack. 2015-10-06 22:39:51 -07:00
John MacFarlane
a3838d0530 appveyor.yml: added 'echo "" |' to work around broken stdin. 2015-10-05 22:50:04 -07:00
John MacFarlane
a5fa9e6951 appveyor.yml: in stack steup, specify 64-bit ghc. 2015-10-05 21:42:52 -07:00
John MacFarlane
96c8b9dc05 appveyor.yml: added stack setup. 2015-10-05 20:59:16 -07:00
John MacFarlane
4a64719c59 appveyor.yml: new attempt to build with stack. 2015-10-05 20:51:26 -07:00