From 3260600b574549282e6e98f3d01e0632b84c6066 Mon Sep 17 00:00:00 2001 From: Tama Date: Wed, 6 Feb 2019 21:12:44 +0100 Subject: [PATCH 1/6] Upgraded stack to lts-13.6 and hakyll to 4.12.5.1 --- empires.cabal | 4 ++-- posts/2017-05-04-textures.markdown | 2 +- stack.yaml | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/empires.cabal b/empires.cabal index e6dd873..9d2273d 100644 --- a/empires.cabal +++ b/empires.cabal @@ -5,7 +5,7 @@ cabal-version: >= 1.10 executable site main-is: site.hs - build-depends: base == 4.* - , hakyll == 4.6.* + build-depends: base >= 4.0 + , hakyll >= 4.6.0 ghc-options: -threaded default-language: Haskell2010 diff --git a/posts/2017-05-04-textures.markdown b/posts/2017-05-04-textures.markdown index 36d94f4..1ecb101 100644 --- a/posts/2017-05-04-textures.markdown +++ b/posts/2017-05-04-textures.markdown @@ -1,5 +1,5 @@ --- -title: A new goal: polish +title: "A new goal: polish" author: Tama --- diff --git a/stack.yaml b/stack.yaml index bff7f4c..268086f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1,4 @@ -resolver: lts-2.22 +resolver: lts-13.6 +extra-deps: +- lrucache-1.2.0.1@sha256:18fc3d7052012c7ab3cd395160f34b53c5e1ec5379cc45185baf35b90ffadc2e +- hakyll-4.12.5.1@sha256:d1948b265e6628bcb6875571212f9acefe23179c73ca4f87f417b290ff381ca6 From 2ed4e107a111e61be98c35aa74c701b85a3d7bd5 Mon Sep 17 00:00:00 2001 From: Tama Date: Wed, 6 Feb 2019 21:34:53 +0100 Subject: [PATCH 2/6] Fixed extra-deps --- stack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.yaml b/stack.yaml index 268086f..4214c1e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ resolver: lts-13.6 extra-deps: -- lrucache-1.2.0.1@sha256:18fc3d7052012c7ab3cd395160f34b53c5e1ec5379cc45185baf35b90ffadc2e -- hakyll-4.12.5.1@sha256:d1948b265e6628bcb6875571212f9acefe23179c73ca4f87f417b290ff381ca6 +- lrucache-1.2.0.1 +- hakyll-4.12.5.1 From a7b761bdcc9bc183af3d14637413da4c1b5616f4 Mon Sep 17 00:00:00 2001 From: Tama Date: Wed, 6 Feb 2019 21:43:44 +0100 Subject: [PATCH 3/6] Added stack install step so that stack is latest version --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4b4a530..504db94 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,6 +12,7 @@ jobs: steps: - run: apt-get update - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git + - run: curl -sSL https://get.haskellstack.org/ | sh - add_ssh_keys - checkout - run: git fetch From b69d809e6142abf40ba40e99302574bf52b1b0c5 Mon Sep 17 00:00:00 2001 From: Tama Date: Wed, 6 Feb 2019 21:45:33 +0100 Subject: [PATCH 4/6] Install curl --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 504db94..78511c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - image: ubuntu:18.04 steps: - run: apt-get update - - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git + - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git curl - run: curl -sSL https://get.haskellstack.org/ | sh - add_ssh_keys - checkout From 06ff2f0c11b7434ac905f2b02d9f6039404f0df4 Mon Sep 17 00:00:00 2001 From: Tama Date: Wed, 6 Feb 2019 21:47:38 +0100 Subject: [PATCH 5/6] Use stack upgrade instead --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78511c3..cd1d405 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,8 +11,8 @@ jobs: - image: ubuntu:18.04 steps: - run: apt-get update - - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git curl - - run: curl -sSL https://get.haskellstack.org/ | sh + - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git + - run: stack upgrade - add_ssh_keys - checkout - run: git fetch From 52dbf8f10a071c4ee3cf4be24bc8dd5130552648 Mon Sep 17 00:00:00 2001 From: Tama Date: Wed, 6 Feb 2019 21:50:50 +0100 Subject: [PATCH 6/6] Try -f to force overwrite stack install --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd1d405..b673d32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,8 +11,8 @@ jobs: - image: ubuntu:18.04 steps: - run: apt-get update - - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git - - run: stack upgrade + - run: apt-get --yes install cabal-install haskell-stack libz-dev netbase locales git curl + - run: curl -sSL https://get.haskellstack.org/ | sh -s - -f - add_ssh_keys - checkout - run: git fetch