Commit graph

224 commits

Author SHA1 Message Date
Joey Hess
df168e3513
avoid running test on windows
It's failed for a long time in the autobuilder environment, and
currently it seems to be hanging.
2020-07-02 13:40:00 -04:00
Joey Hess
b54bf31eb7
Revert "remove .stack-work"
This reverts commit e930237f61.

Unbelievably, that worked, somehow the preprocessed file had gotten
cached from the wrong version. Windows has found a new way to amaze me in
its horribleness.
2020-07-02 11:29:24 -04:00
Joey Hess
e930237f61
remove .stack-work
build is failing on commit d409f92318
but the error message quotes a version of Utility/Process/Transcript.hs
before a fix yesterday. All I can think is stack may have cached the old
version, perhaps after cpp?
2020-07-02 11:16:05 -04:00
Joey Hess
ff85adba76
remove bundled rsync from windows build
rsync is only needed for rsync special remotes and git-annex-shell from
Debian oldstable. Since the library situation on windows for rsync required
a particular 32 bit build of git for it to work, and may also somehow need
git-annex to be 32 bit build, it's better to not include it.

This commit was sponsored by Jake Vosloo on Patreon.
2019-07-22 09:37:42 -04:00
Joey Hess
663b0353c9
remove cygwin stuff from this script
cygwin in not needed to build git-annex on windows AFAIK
2019-07-22 09:28:00 -04:00
Joey Hess
9709beba77
try to build deps before buildversion 2019-07-21 17:12:39 -04:00
Joey Hess
a33324256d
no need to upgrade stack as windows autobuild host is updated to newest 2019-07-21 17:09:37 -04:00
Joey Hess
605b98bc3a
upgrade stack by downloading binary, not build from source
stack upgrade --git is failing on windows, the ghc version it downloaded to
upgrade itself does not work:

11:06:25      Configuring base-compat-0.9.3...
11:06:25      Cabal-simple_Z6RU0evB_2.0.1.0_ghc-8.2.2.exe: The program 'ghc-pkg' is required
11:06:25      but the version of
11:06:25      C:\Users\jenkins\AppData\Local\Programs\stack\i386-windows\ghc-8.2.2\bin\ghc-pkg.EXE
11:06:25      could not be determined.
2019-07-09 11:14:30 -04:00
Joey Hess
0a8be11c9e
upgrade stack on windows 2019-07-09 11:01:27 -04:00
Joey Hess
4b7aea8714
update stack.yaml to latest lts and remove stack-windows.yaml
The latter should not be needed as this lts version includes Win32.
2019-07-09 10:33:21 -04:00
Joey Hess
a1b55056fc
Make Build/BuildVersion update embedded version number
This way, autobuilders can run it before building, in a tree where
git-annex was already built, and get the current git rev embedded in the
build.

Before, the version number only updated when the setup program was run,
which was up to cabal and not on every build.
2018-06-26 10:36:54 -04:00
Joey Hess
25854c73db
still need stack-windows.yaml to specify newer versions of Win32 and unix-compat 2017-11-09 13:54:05 -04:00
Joey Hess
a0c38d7c96
use win32 2.6.1.0
That has my patches merged into it, so stack-windows.yaml is not needed
any longer.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2017-11-09 13:39:07 -04:00
Joey Hess
3d42168364
fix path 2017-10-26 13:42:54 -04:00
Joey Hess
d451d333d8
use upgraded stack 2017-10-26 12:15:00 -04:00
Joey Hess
932d4211a4
upgrade stack to avoid https://github.com/commercialhaskell/stack/issues/2960 2017-10-26 11:40:28 -04:00
Joey Hess
099ff702ea
improve cleanup 2017-10-26 11:34:14 -04:00
Joey Hess
6e202b8dc9
Revert "debugging strange old version of git-annex in windows installer bundle"
This reverts commit 1a338ed920.
2017-10-26 11:32:04 -04:00
Joey Hess
1a338ed920
debugging strange old version of git-annex in windows installer bundle 2017-10-26 11:21:27 -04:00
Joey Hess
50c0fb7336
unify stack build and stack install
For some reason, when stack install is run separately, it seems to be
installing a previous build from a different temp dir. WTF?
2017-10-26 10:10:02 -04:00
Joey Hess
d428f66cdd
simplify build 2017-10-25 17:54:33 -04:00
Joey Hess
9be00f2537
try to put git for windows first
I think there'a a cygwin git in path confusing things
2017-10-25 14:52:08 -04:00
Joey Hess
357a6e6709
work around stack-work directory path bug
fatal: Invalid path '/cygdrive/c/jenkins/workspace/git-annex-master/git-annex/.stack-work/downloaded/C:\jenkins\workspace\git-annex-master\git-annex\.stack-work\downloaded\56E6vnUQljVi': No such file or directory
2017-10-25 14:49:35 -04:00
Joey Hess
833b3f06cd
build for windows with forked win32 package that has terminateProcessId
Get ugly reversion out of CHANGELOG.

Also, relocated the windows stack.yaml to top, and updated windows build
instructions.

This commit was sponsored by Henrik Riomar on Patreon.
2017-10-25 14:45:23 -04:00
Joey Hess
0156ea7f53
expand comment 2017-10-25 14:02:49 -04:00
Joey Hess
54e596894f
Windows: Remove wget from bundle; it needs libraries that are not included, and git for windows includes curl which git-annex will use instead.
wget was broken even in the previous old release of the windows bundle,
this is not new breakage. msys-idn-11.dll and probably more would be needed
to use it. git for windows includes msys-idn2-0.dll instead.
2017-10-25 13:51:31 -04:00
Joey Hess
7dc477a4fc
fix build-version creation 2017-10-25 13:37:51 -04:00
Joey Hess
dd6d0cc9af
fix path
git-annex is installed into . by Build/NullSoftInstaller, so use that
for running git-annex test
2017-10-25 00:23:18 -04:00
Joey Hess
2a2e30f729
make dir 2017-10-25 00:19:10 -04:00
Joey Hess
3761f5a052
try different path 2017-10-25 00:09:58 -04:00
Joey Hess
cea1fed395
try different path 2017-10-25 00:07:39 -04:00
Joey Hess
7688d64564
add bin path 2017-10-25 00:02:25 -04:00
Joey Hess
c03c1d800e
avoid stack runghc
Seems to want to recompile git-annex before running unrelated program.

stack ghc does not have that problem
2017-10-24 13:46:53 -04:00
Joey Hess
0804599941
--no-haddock 2017-10-24 13:37:57 -04:00
Joey Hess
21d6df8f91
use windows stack.yaml for additional stack commands 2017-10-24 13:30:51 -04:00
Joey Hess
2c71f4a3a8
remove unncessary withcyg 2017-10-24 12:05:00 -04:00
Joey Hess
6f7db3df09
add to PATH 2017-10-24 12:02:14 -04:00
Joey Hess
a732dbee31
get rsync before build 2017-10-22 15:22:24 -04:00
Joey Hess
c745480882
typo 2017-10-22 15:20:26 -04:00
Joey Hess
008e991ff5
run only 1 job
Seeing interrmittent build failures that may be related to stack's
concurrency
2017-10-22 15:02:43 -04:00
Joey Hess
87c6f506e7
disable haddock 2017-10-22 14:50:09 -04:00
Joey Hess
0e766a41c6
try lts-9.10 with old win32
toolchain issue is preventing nightly from building anything on windows
2017-10-22 14:20:54 -04:00
Joey Hess
11928ae432
add IfElse version 2017-10-22 14:08:45 -04:00
Joey Hess
fda47b0a01
switch to nightly-2017-10-22 for newer win32 2017-10-22 14:03:10 -04:00
Joey Hess
79f56fd449
point packages dir at top 2017-10-22 13:59:42 -04:00
Joey Hess
84a517dbcb
windows-specific stack.yaml to enable Win32 2017-10-22 13:58:21 -04:00
Joey Hess
7391c49305
temporarily disable rm to get building 2017-10-22 13:42:46 -04:00
Joey Hess
bc08ef886d
better fix for rm path 2017-10-22 13:40:01 -04:00
Joey Hess
836e70424d
add cygwin bin to path 2017-10-22 13:39:26 -04:00
Joey Hess
35c807b5bc
remove msysgit cruft 2017-10-22 13:38:11 -04:00