diff options
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | FormatOpts.hs | 3 | ||||
| -rw-r--r-- | reploy.cabal | 4 |
3 files changed, 11 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1193af7..da895cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,10 @@ -image: docker:20.10.16 - -variables: - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" - -services: - - name: repomanager.lcsb.uni.lu:9999/library/docker:20.10.16-dind - command: ["--mtu=1458", "--registry-mirror", "https://repomanager.lcsb.uni.lu:9999"] - alias: docker +default: + image: repomanager.lcsb.uni.lu:9999/docker:27.4.0 + before_script: + - unset DOCKER_HOST + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + tags: + - lcsb stages: - build @@ -15,12 +12,9 @@ stages: build: stage: build script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker build -t $CI_REGISTRY_IMAGE:latest . + - docker build --pull --load -t $CI_REGISTRY_IMAGE:latest . - docker push $CI_REGISTRY_IMAGE:latest - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA rules: - if: '$CI_COMMIT_REF_NAME == "master"' - tags: - - lcsb diff --git a/FormatOpts.hs b/FormatOpts.hs index 1242629..947ac24 100644 --- a/FormatOpts.hs +++ b/FormatOpts.hs @@ -16,7 +16,6 @@ module FormatOpts where import Text.Pandoc.Extensions -import Text.Pandoc.Highlighting (pygments) import Text.Pandoc.Options -- | Default markdown reading options for Pandoc. @@ -36,7 +35,7 @@ htmlWriteOpts :: WriterOptions htmlWriteOpts = def { writerExtensions = enableExtension Ext_smart pandocExtensions - , writerHighlightStyle = Just pygments + , writerHighlightMethod = DefaultHighlighting , writerWrapText = WrapPreserve } diff --git a/reploy.cabal b/reploy.cabal index d4d5f57..adfd45f 100644 --- a/reploy.cabal +++ b/reploy.cabal @@ -2,7 +2,7 @@ cabal-version: 3.0 name: reploy synopsis: Straightforward static all-in-one website builder category: Web -version: 0.3.3.0 +version: 0.3.4.0 build-type: Simple license: Apache-2.0 license-file: LICENSE @@ -31,7 +31,7 @@ executable reploy , microlens-th , mustache , optparse-applicative - , pandoc + , pandoc ^>=3.8 , pandoc-types , parsec , scientific |