7634b44 · hakyll · git.iko.soy

git.iko.soy/hakyll

Build on CircleCI

commit7634b44e4ad9f6a0ba77c377eb1ee43085687789 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateMon 18 Dec 2017, 19:29 (9 years ago) parent39b247e

6 files changed+115−83

compare with master

unifiedsplit

.circleci/config.yml+25 .circleci/tickle.sh+24 .travis.yml−18 README.markdown+1−1 hakyll.cabal+64−64 stack.yaml+1

.circleci/config.ymlnew file+25

@@ -0,0 +1,25 @@

1+version: 2

2+jobs:

3+ build:

4+ docker:

5+ - image: 'fpco/stack-build:latest'

6+ steps:

7+ - checkout

8+ - restore_cache:

9+ key: 'v1-hakyll-{{ arch }}-{{ .Branch }}'

10+ - run:

11+ name: 'Update cabal indices'

12+ command: 'cabal update'

13+ - run:

14+ # We set jobs to 1 here because that prevents Out-Of-Memory exceptions

15+ # while compiling dependencies.

16+ name: 'Install dependencies'

17+ command: '.circleci/tickle.sh cabal install --only-dependencies --enable-tests --jobs=1'

18+ - run:

19+ name: 'Build and run tests'

20+ command: 'cabal test'

21+ - save_cache:

22+ key: 'v1-hakyll-{{ arch }}-{{ .Branch }}-{{ .Revision }}'

23+ paths:

24+ - '~/.cabal'

25+ - '~/.ghc'

.circleci/tickle.shnew file+24

@@ -0,0 +1,24 @@

1+#!/bin/bash

2+set -o nounset -o errexit -o pipefail

4+function tickle() {

5+ while [ true ]; do

6+ echo "[$(date +%H:%M:%S)"] Tickling...

7+ sleep 60

8+ done

9+}

10+

11+echo "Forking tickle process..."

12+tickle &

13+TICKLE_PID=$!

14+

15+echo "Forking build process..."

16+eval $@ &

17+BUILD_PID=$!

18+

19+echo "Waiting for build thread ($BUILD_PID)..."

20+wait $BUILD_PID

21+

22+echo "Killing tickle thread ($TICKLE_PID)..."

23+kill $TICKLE_PID

24+echo "All done!"

.travis.ymldeleted−18

@@ -1,18 +0,0 @@

1−language: haskell

2−ghc: '8.0.2'

3−sudo: false

4−

5−cache:

6− directories:

7− - '$HOME/.cabal'

8− - '$HOME/.ghc'

9−

10−branches:

11− only:

12− - 'master'

13−

14−install:

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

16−

17−script:

18− - cabal test

README.markdown+1−1

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

11# hakyll

3−[![Build Status](https://img.shields.io/travis/jaspervdj/hakyll.svg)](http://travis-ci.org/jaspervdj/hakyll)

3+[![Build Status](https://img.shields.io/circleci/project/github/jaspervdj/hakyll.svg)](https://circleci.com/gh/jaspervdj/hakyll)

55Hakyll is a static site generator library in Haskell. More information

66(including a tutorial) can be found on

hakyll.cabal+64−64

@@ -153,38 +153,38 @@ Library

153153 Paths_hakyll

154154

155155 Build-Depends:

156− base >= 4.8 && < 5,

157− binary >= 0.5 && < 0.9,

158− blaze-html >= 0.5 && < 0.10,

159− blaze-markup >= 0.5.1 && < 0.9,

160− bytestring >= 0.9 && < 0.11,

161− containers >= 0.3 && < 0.6,

162− cryptohash >= 0.7 && < 0.12,

163− data-default >= 0.4 && < 0.8,

164− deepseq >= 1.3 && < 1.5,

165− directory >= 1.0 && < 1.4,

166− filepath >= 1.0 && < 1.5,

167− lrucache >= 1.1.1 && < 1.3,

168− mtl >= 1 && < 2.3,

169− network >= 2.6 && < 2.7,

170− network-uri >= 2.6 && < 2.7,

171− pandoc >= 2.0.5 && < 2.1,

172− pandoc-citeproc >= 0.12 && < 0.13,

173− parsec >= 3.0 && < 3.2,

174− process >= 1.6 && < 1.7,

175− random >= 1.0 && < 1.2,

176− regex-base >= 0.93 && < 0.94,

177− regex-tdfa >= 1.1 && < 1.3,

178− resourcet >= 1.1 && < 1.2,

179− scientific >= 0.3.4 && < 0.4,

180− tagsoup >= 0.13.1 && < 0.15,

181− text >= 0.11 && < 1.3,

182− time >= 1.8 && < 1.9,

183− time-locale-compat >= 0.1 && < 0.2,

184− unordered-containers >= 0.2 && < 0.3,

185− vector >= 0.11 && < 0.13,

186− yaml >= 0.8.11 && < 0.9,

187− optparse-applicative >= 0.12 && < 0.15

156+ base >= 4.8 && < 5,

157+ binary >= 0.5 && < 0.9,

158+ blaze-html >= 0.5 && < 0.10,

159+ blaze-markup >= 0.5.1 && < 0.9,

160+ bytestring >= 0.9 && < 0.11,

161+ containers >= 0.3 && < 0.6,

162+ cryptohash >= 0.7 && < 0.12,

163+ data-default >= 0.4 && < 0.8,

164+ deepseq >= 1.3 && < 1.5,

165+ directory >= 1.0 && < 1.4,

166+ filepath >= 1.0 && < 1.5,

167+ lrucache >= 1.1.1 && < 1.3,

168+ mtl >= 1 && < 2.3,

169+ network >= 2.6 && < 2.7,

170+ network-uri >= 2.6 && < 2.7,

171+ pandoc >= 2.0.5 && < 2.1,

172+ pandoc-citeproc >= 0.12.1.1 && < 0.13,

173+ parsec >= 3.0 && < 3.2,

174+ process >= 1.6 && < 1.7,

175+ random >= 1.0 && < 1.2,

176+ regex-base >= 0.93 && < 0.94,

177+ regex-tdfa >= 1.1 && < 1.3,

178+ resourcet >= 1.1 && < 1.2,

179+ scientific >= 0.3.4 && < 0.4,

180+ tagsoup >= 0.13.1 && < 0.15,

181+ text >= 0.11 && < 1.3,

182+ time >= 1.8 && < 1.9,

183+ time-locale-compat >= 0.1 && < 0.2,

184+ unordered-containers >= 0.2 && < 0.3,

185+ vector >= 0.11 && < 0.13,

186+ yaml >= 0.8.11 && < 0.9,

187+ optparse-applicative >= 0.12 && < 0.15

188188

189189 If flag(previewServer)

190190 Build-depends:

@@ -248,38 +248,38 @@ Test-suite hakyll-tests

248248 tasty-hunit >= 0.9 && < 0.10,

249249 tasty-quickcheck >= 0.8 && < 0.10,

250250 -- Copy pasted from hakyll dependencies:

251− base >= 4.8 && < 5,

252− binary >= 0.5 && < 0.9,

253− blaze-html >= 0.5 && < 0.10,

254− blaze-markup >= 0.5.1 && < 0.9,

255− bytestring >= 0.9 && < 0.11,

256− containers >= 0.3 && < 0.6,

257− cryptohash >= 0.7 && < 0.12,

258− data-default >= 0.4 && < 0.8,

259− deepseq >= 1.3 && < 1.5,

260− directory >= 1.0 && < 1.4,

261− filepath >= 1.0 && < 1.5,

262− lrucache >= 1.1.1 && < 1.3,

263− mtl >= 1 && < 2.3,

264− network >= 2.6 && < 2.7,

265− network-uri >= 2.6 && < 2.7,

266− pandoc >= 2.0.5 && < 2.1,

267− pandoc-citeproc >= 0.12 && < 0.13,

268− parsec >= 3.0 && < 3.2,

269− process >= 1.6 && < 1.7,

270− random >= 1.0 && < 1.2,

271− regex-base >= 0.93 && < 0.94,

272− regex-tdfa >= 1.1 && < 1.3,

273− resourcet >= 1.1 && < 1.2,

274− scientific >= 0.3.4 && < 0.4,

275− tagsoup >= 0.13.1 && < 0.15,

276− text >= 0.11 && < 1.3,

277− time >= 1.8 && < 1.9,

278− time-locale-compat >= 0.1 && < 0.2,

279− unordered-containers >= 0.2 && < 0.3,

280− vector >= 0.11 && < 0.13,

281− yaml >= 0.8.11 && < 0.9,

282− optparse-applicative >= 0.12 && < 0.15

251+ base >= 4.8 && < 5,

252+ binary >= 0.5 && < 0.9,

253+ blaze-html >= 0.5 && < 0.10,

254+ blaze-markup >= 0.5.1 && < 0.9,

255+ bytestring >= 0.9 && < 0.11,

256+ containers >= 0.3 && < 0.6,

257+ cryptohash >= 0.7 && < 0.12,

258+ data-default >= 0.4 && < 0.8,

259+ deepseq >= 1.3 && < 1.5,

260+ directory >= 1.0 && < 1.4,

261+ filepath >= 1.0 && < 1.5,

262+ lrucache >= 1.1.1 && < 1.3,

263+ mtl >= 1 && < 2.3,

264+ network >= 2.6 && < 2.7,

265+ network-uri >= 2.6 && < 2.7,

266+ pandoc >= 2.0.5 && < 2.1,

267+ pandoc-citeproc >= 0.12.1.1 && < 0.13,

268+ parsec >= 3.0 && < 3.2,

269+ process >= 1.6 && < 1.7,

270+ random >= 1.0 && < 1.2,

271+ regex-base >= 0.93 && < 0.94,

272+ regex-tdfa >= 1.1 && < 1.3,

273+ resourcet >= 1.1 && < 1.2,

274+ scientific >= 0.3.4 && < 0.4,

275+ tagsoup >= 0.13.1 && < 0.15,

276+ text >= 0.11 && < 1.3,

277+ time >= 1.8 && < 1.9,

278+ time-locale-compat >= 0.1 && < 0.2,

279+ unordered-containers >= 0.2 && < 0.3,

280+ vector >= 0.11 && < 0.13,

281+ yaml >= 0.8.11 && < 0.9,

282+ optparse-applicative >= 0.12 && < 0.15

283283

284284 If flag(previewServer)

285285 Build-depends:

stack.yaml+1

@@ -13,6 +13,7 @@ packages:

1313extra-deps:

1414 - hslua-module-text-0.1.2

1515 - skylighting-0.5

16+ - pandoc-citeproc-0.12.1.1

1617

1718nix:

1819 enable: false