39b247e · hakyll · git.iko.soy

git.iko.soy/hakyll

Get Travis working again (longer timeouts...)

commit39b247ee9208fbbb2f183ddf5d0db98772a51b3e authorJasper Van der Jeugt <jaspervdj@gmail.com> dateSun 17 Dec 2017, 11:57 (9 years ago) parentf09cfe4

3 files changed+14−21

compare with master

unifiedsplit

.travis.yml+7−17 hakyll.cabal+2−2 stack.yaml+5−2

.travis.yml+7−17

@@ -1,28 +1,18 @@

1+language: haskell

2+ghc: '8.0.2'

13sudo: false

35cache:

46 directories:

5− - $HOME/.stack

7+ - '$HOME/.cabal'

8+ - '$HOME/.ghc'

710branches:

811 only:

9− - master

10−

11−cache:

12− directories:

13− - $HOME/.stack

14− - .stack-work

15−

16−before_install:

17− - mkdir -p ~/.local/bin

18− - export PATH=$HOME/.local/bin:$PATH

19− - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

12+ - 'master'

2013

2114install:

22− - stack --no-terminal --skip-ghc-check setup

23−

24−before_script:

25− - echo "override before_script"

15+ - travis_wait 40 cabal install --enable-tests

2616

2717script:

28− - stack --no-terminal --skip-ghc-check test

18+ - cabal test

hakyll.cabal+2−2

@@ -168,7 +168,7 @@ Library

168168 mtl >= 1 && < 2.3,

169169 network >= 2.6 && < 2.7,

170170 network-uri >= 2.6 && < 2.7,

171− pandoc >= 2.0 && < 2.1,

171+ pandoc >= 2.0.5 && < 2.1,

172172 pandoc-citeproc >= 0.12 && < 0.13,

173173 parsec >= 3.0 && < 3.2,

174174 process >= 1.6 && < 1.7,

@@ -263,7 +263,7 @@ Test-suite hakyll-tests

263263 mtl >= 1 && < 2.3,

264264 network >= 2.6 && < 2.7,

265265 network-uri >= 2.6 && < 2.7,

266− pandoc >= 2.0 && < 2.1,

266+ pandoc >= 2.0.5 && < 2.1,

267267 pandoc-citeproc >= 0.12 && < 0.13,

268268 parsec >= 3.0 && < 3.2,

269269 process >= 1.6 && < 1.7,

stack.yaml+5−2

@@ -1,6 +1,5 @@

1−resolver: nightly-2017-11-20

1+resolver: nightly-2017-12-14

22extra-package-dbs: []

3−extra-deps: []

54flags:

65 hakyll:

@@ -11,6 +10,10 @@ flags:

1110packages:

1211 - '.'

1312

13+extra-deps:

14+ - hslua-module-text-0.1.2

15+ - skylighting-0.5

16+

1417nix:

1518 enable: false

1619 packages: