Use ‘ghc-syntax-highlighter’ (#35)

mrkkrp · May 13, 2018 · 6977782782ab98e1e79d5e0baa0df78c1ffeccd8 · 6977782
1 parent 41f5ade
commit 6977782782ab98e1e79d5e0baa0df78c1ffeccd8
Unified Split

Showing with 39 additions and 21 deletions.

+18 −18 .circleci/config.yml

+11 −1 .circleci/images/primary/Dockerfile

+5 −0 .circleci/images/primary/stack.yaml

+1 −0 app/Main.hs

+3 −1 stack.yaml

+1 −1 static/css/bootstrap.min.css
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,19 +2,19 @@ version: 2
 jobs:
  build:
    docker:
-      - image: mrkkrp/mk-com:0.1.1
+      - image: mrkkrp/mk-com:0.2.0
    steps:
      - checkout
-      - restore_cache:
-          keys:
-            - stack-home-{{ checksum "stack.yaml" }}
-            - stack-home-
-      - restore_cache:
-          keys:
-            - stack-work-{{ checksum "stack.yaml" }}
-            - stack-work-
-      - run: stack --version
-      - run: stack setup
+      # - restore_cache:
+      #     keys:
+      #       - stack-home-{{ checksum "stack.yaml" }}
+      #       - stack-home-
+      # - restore_cache:
+      #     keys:
+      #       - stack-work-{{ checksum "stack.yaml" }}
+      #       - stack-work-
+      # - run: stack --version
+      # - run: stack setup
      - run: stack build
      - run: stack test
      - run: stack exec mk-com -- clean
@@ -25,16 +25,16 @@ jobs:
          root: ~/project
          paths:
            - _build
-      - save_cache:
-          key: stack-home-{{ checksum "stack.yaml" }}
-          paths: "~/.stack"
-      - save_cache:
-          key: stack-work-{{ checksum "stack.yaml" }}
-          paths: ".stack-work"
+      # - save_cache:
+      #     key: stack-home-{{ checksum "stack.yaml" }}
+      #     paths: "~/.stack"
+      # - save_cache:
+      #     key: stack-work-{{ checksum "stack.yaml" }}
+      #     paths: ".stack-work"

  deploy:
    docker:
-      - image: mrkkrp/mk-com:0.1.1
+      - image: mrkkrp/mk-com:0.2.0
    steps:
      - attach_workspace:
          at: /tmp
diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile
@@ -5,7 +5,17 @@ WORKDIR /home/
 ENV PATH /home/circleci/.local/bin:$PATH

 RUN sudo apt-get --quiet update
-RUN sudo apt-get --quiet install python python-pip rsync texlive-latex-base texlive-latex-extra
+RUN sudo apt-get --quiet install python python-pip rsync texlive-latex-base texlive-latex-extra libtinfo-dev
 RUN pip install html5validator
 RUN (curl -sSL https://get.haskellstack.org/ | sh) || true
 RUN stack upgrade
+
+WORKDIR /home/circleci
+RUN git clone https://github.com/mrkkrp/markkarpov.com project
+WORKDIR /home/circleci/project
+COPY stack.yaml stack.yaml
+RUN stack setup
+RUN stack build
+RUN stack test
+WORKDIR /home/circleci
+RUN rm -rvf project
diff --git a/.circleci/images/primary/stack.yaml b/.circleci/images/primary/stack.yaml
@@ -0,0 +1,5 @@
+resolver: nightly-2018-05-13
+packages:
+- '.'
+extra-deps:
+- mmark-ext-0.2.1.0
diff --git a/app/Main.hs b/app/Main.hs
@@ -448,6 +448,7 @@ getPostHelper env path = do
            , Ext.mathJax (Just '$')
            , Ext.obfuscateEmail "protected-email"
            , Ext.punctuationPrettifier
+            , Ext.ghcSyntaxHighlighter
            , Ext.skylighting
            , Ext.toc "toc" toc
            , addTableClasses
diff --git a/stack.yaml b/stack.yaml
@@ -1,3 +1,5 @@
-resolver: lts-11.0
+resolver: nightly-2018-05-13
 packages:
 - '.'
+extra-deps:
+- mmark-ext-0.2.1.0
diff --git a/static/css/bootstrap.min.css b/static/css/bootstrap.min.css