Merge branch 'master' of gitlab.lrz.de:i7/peregrine

816236d3 · Philipp Meyer · 7aa92317 · 6ca1dec4 · 816236d3 · 816236d3
Commit 816236d3 authored Jan 10, 2020 by Philipp Meyer
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+image: gitlab-runner/haskell
+
+stages:
+  - build
+
+Build:
+  stage:
+    build
+  script:
+    - make build
+    - cp dist/build/peregrine/peregrine peregrine
+  artifacts:
+    paths:
+      - peregrine
+    when: on_success
+    expire_in: 1 week
--- a/Makefile
+++ b/Makefile
 all: build

 build:
+	cabal install --only-dependencies
 	cabal build

 install:

--- a/peregrine.cabal
+++ b/peregrine.cabal
@@ -22,8 +22,8 @@ executable peregrine
  main-is: Main.hs
  other-modules:
  -- other-extensions:
-  build-depends:       base >=4 && <5, sbv, parsec >= 3.1, containers, transformers,
+  build-depends:       base >=4 && <5, sbv == 7.13, parsec >= 3.1, containers, transformers,
                       bytestring, mtl, stm, async, text, aeson
  hs-source-dirs:      src
  default-language:    Haskell2010
-  ghc-options:         -fsimpl-tick-factor=1000 -threaded -rtsopts -with-rtsopts=-N -dynamic
+  ghc-options:         -fsimpl-tick-factor=1000 -threaded -rtsopts -with-rtsopts=-N