diff --git a/.gitignore b/.gitignore index cd0ca2a..e66ac91 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ cabal.sandbox.config cabal.config _cache _site +.stack-work/ diff --git a/.travis.yml b/.travis.yml index f961df5..f53923f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ language: haskell branches: only: - source +install: +- wget https://github.com/commercialhaskell/stack/releases/download/v1.0.0/stack-1.0.0-linux-x86_64.tar.gz -O stack.gz +- tar xvf stack.gz +- chmod +x stack-1.0.0-linux-x86_64/stack +- stack-1.0.0-linux-x86_64/stack setup +- stack-1.0.0-linux-x86_64/stack build before_script: - git config --global user.name 'Build Bot' - git config --global user.email 'build@hackconf.in' @@ -11,7 +17,7 @@ before_script: - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - mkdir deploy/ script: -- cabal build && dist/build/navya-website/navya-website build +- .stack-work/install/x86_64-linux/lts-2.0/7.8.4/bin/navya-website build after_script: - cp -r _site/* deploy/ - cd deploy/ @@ -21,6 +27,7 @@ after_script: - git add --all . - git commit -m "generated on `date`" - git push origin master --force -q +after_success: true env: global: - REPO="git@github.com:navya/navya.github.io.git" diff --git a/navya-website.cabal b/navya-website.cabal index e37a472..fed553b 100644 --- a/navya-website.cabal +++ b/navya-website.cabal @@ -20,6 +20,6 @@ executable navya-website main-is: Main.hs -- other-modules: other-extensions: UnicodeSyntax, Arrows, OverloadedStrings - build-depends: base >=4.6 && <4.8, filepath >=1.3 && <1.4, pandoc >=1.12 && <1.13, hakyll + build-depends: base >=4.6 && <4.8, filepath >=1.3 && <1.4, pandoc <=1.13.2, hakyll hs-source-dirs: src default-language: Haskell2010 diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..0acd093 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,3 @@ +packages: + - '.' +resolver: lts-2.0