Updated stack and moved to stack

stack setup
stack build
stack exec site build

for building the project.
This commit is contained in:
Dhananjay Balan 2018-03-04 22:56:07 +01:00
parent 1520371af9
commit 8185eec5f1
4 changed files with 20 additions and 17 deletions

View File

@ -1,4 +1,10 @@
image: dmp1ce/hakyll:latest image: fpco/stack-build
test:
script:
- stack setup
- stack build
- stack exec site build
deploy: deploy:
before_script: before_script:
@ -15,12 +21,10 @@ deploy:
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
- cabal update - stack setup
- cabal install regex-compat
script: script:
- cabal build - stack build
- cabal run clean - stack exec site build
- cabal run build
- scp -r public root@dbalan.in:/usr/local/www/blog/ - scp -r public root@dbalan.in:/usr/local/www/blog/
only: only:
- master - master

View File

@ -6,7 +6,7 @@ cabal-version: >= 1.10
executable site executable site
main-is: site.hs main-is: site.hs
build-depends: base == 4.* build-depends: base == 4.*
, hakyll == 4.9.* , hakyll >= 4.10.0
, filepath >= 1.4 , filepath >= 1.4
, regex-compat , regex-compat
ghc-options: -threaded ghc-options: -threaded

View File

@ -35,8 +35,8 @@ main = hakyllWith config $ do
compile copyFileCompiler compile copyFileCompiler
match "notes/*" $ do match "notes/*" $ do
route $ idRoute route $ idRoute
compile copyFileCompiler compile copyFileCompiler
match "blog/*" $ do match "blog/*" $ do
route $ octopressRoute route $ octopressRoute

View File

@ -2,7 +2,7 @@
# #
# Some commonly used options have been documented as comments in this file. # Some commonly used options have been documented as comments in this file.
# For advanced use and comprehensive documentation of the format, please see: # For advanced use and comprehensive documentation of the format, please see:
# http://docs.haskellstack.org/en/stable/yaml_configuration/ # https://docs.haskellstack.org/en/stable/yaml_configuration/
# Resolver to choose a 'specific' stackage snapshot or a compiler version. # Resolver to choose a 'specific' stackage snapshot or a compiler version.
# A snapshot resolver dictates the compiler version and the set of packages # A snapshot resolver dictates the compiler version and the set of packages
@ -15,7 +15,7 @@
# resolver: # resolver:
# name: custom-snapshot # name: custom-snapshot
# location: "./custom-snapshot.yaml" # location: "./custom-snapshot.yaml"
resolver: nightly-2016-10-31 resolver: lts-10.8
# User packages to be built. # User packages to be built.
# Various formats can be used as shown in the example below. # Various formats can be used as shown in the example below.
@ -36,24 +36,23 @@ resolver: nightly-2016-10-31
# non-dependency (i.e. a user package), and its test suites and benchmarks # non-dependency (i.e. a user package), and its test suites and benchmarks
# will not be run. This is useful for tweaking upstream packages. # will not be run. This is useful for tweaking upstream packages.
packages: packages:
- '.' - .
- '../../public/hakyll'
# Dependency packages to be pulled from upstream that are not in the resolver # Dependency packages to be pulled from upstream that are not in the resolver
# (e.g., acme-missiles-0.3) # (e.g., acme-missiles-0.3)
extra-deps: [] # extra-deps: []
# Override default flag values for local packages and extra-deps # Override default flag values for local packages and extra-deps
flags: {} # flags: {}
# Extra package databases containing global packages # Extra package databases containing global packages
extra-package-dbs: [] # extra-package-dbs: []
# Control whether we use the GHC we find on the path # Control whether we use the GHC we find on the path
# system-ghc: true # system-ghc: true
# #
# Require a specific version of stack, using version ranges # Require a specific version of stack, using version ranges
# require-stack-version: -any # Default # require-stack-version: -any # Default
# require-stack-version: ">=1.3" # require-stack-version: ">=1.6"
# #
# Override the architecture used by stack, especially useful on Windows # Override the architecture used by stack, especially useful on Windows
# arch: i386 # arch: i386