on master help sign in
Get Travis working again (longer timeouts...)
39b247eJasper Van der Jeugt
.travis.yml+7−17
@@ -1,28 +1,18 @@
1+language: haskell
2+ghc: '8.0.2'
1sudo: false
3sudo: false
2
4
3cache:
5cache:
4 directories:
6 directories:
5− - $HOME/.stack
7+ - '$HOME/.cabal'
8+ - '$HOME/.ghc'
6
9
7branches:
10branches:
8 only:
11 only:
9− - master
12+ - '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'
20
13
21install:
14install:
22− - stack --no-terminal --skip-ghc-check setup
15+ - travis_wait 40 cabal install --enable-tests
23−
24−before_script:
25− - echo "override before_script"
26
16
27script:
17script:
28− - stack --no-terminal --skip-ghc-check test
18+ - cabal test
hakyll.cabal+2−2
@@ -168,7 +168,7 @@ Library
168 mtl >= 1 && < 2.3,
168 mtl >= 1 && < 2.3,
169 network >= 2.6 && < 2.7,
169 network >= 2.6 && < 2.7,
170 network-uri >= 2.6 && < 2.7,
170 network-uri >= 2.6 && < 2.7,
171− pandoc >= 2.0 && < 2.1,
171+ pandoc >= 2.0.5 && < 2.1,
172 pandoc-citeproc >= 0.12 && < 0.13,
172 pandoc-citeproc >= 0.12 && < 0.13,
173 parsec >= 3.0 && < 3.2,
173 parsec >= 3.0 && < 3.2,
174 process >= 1.6 && < 1.7,
174 process >= 1.6 && < 1.7,
@@ -263,7 +263,7 @@ Test-suite hakyll-tests
263 mtl >= 1 && < 2.3,
263 mtl >= 1 && < 2.3,
264 network >= 2.6 && < 2.7,
264 network >= 2.6 && < 2.7,
265 network-uri >= 2.6 && < 2.7,
265 network-uri >= 2.6 && < 2.7,
266− pandoc >= 2.0 && < 2.1,
266+ pandoc >= 2.0.5 && < 2.1,
267 pandoc-citeproc >= 0.12 && < 0.13,
267 pandoc-citeproc >= 0.12 && < 0.13,
268 parsec >= 3.0 && < 3.2,
268 parsec >= 3.0 && < 3.2,
269 process >= 1.6 && < 1.7,
269 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
2extra-package-dbs: []
2extra-package-dbs: []
3−extra-deps: []
4
3
5flags:
4flags:
6 hakyll:
5 hakyll:
@@ -11,6 +10,10 @@ flags:
11packages:
10packages:
12 - '.'
11 - '.'
13
12
13+extra-deps:
14+ - hslua-module-text-0.1.2
15+ - skylighting-0.5
16+
14nix:
17nix:
15 enable: false
18 enable: false
16 packages:
19 packages: