Skip to content

Commit

Permalink
Allowed building with stack
Browse files Browse the repository at this point in the history
Move ahead with times :)
  • Loading branch information
sakshamsharma committed Feb 28, 2016
1 parent 7be3eda commit ec17676
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ cabal.sandbox.config
cabal.config
_cache
_site
.stack-work/
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 '[email protected]'
Expand All @@ -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/
Expand All @@ -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="[email protected]:navya/navya.github.io.git"
Expand Down
2 changes: 1 addition & 1 deletion navya-website.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
packages:
- '.'
resolver: lts-2.0

0 comments on commit ec17676

Please sign in to comment.