allow ghc-8.4

add to stack and travis
dintxaustip · Mar 15, 2018 · f2c855b · f2c855b
1 parent 21584b5
commit f2c855b
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,10 +27,9 @@ addons:
       # - llvm-toolchain-precise-3.6
       - llvm-toolchain-precise-3.7
       # - llvm-toolchain-precise-3.8
-      # - llvm-toolchain-precise-3.9
-      # - llvm-toolchain-precise-4.0  # not white-listed yet
-      - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main'
-        key_url: 'http://apt.llvm.org/llvm-snapshot.gpg.key'
+      # - llvm-toolchain-trusty-3.9
+      - llvm-toolchain-trusty-4.0
+      - llvm-toolchain-trusty-5.0
 
     packages: &apt_packages
       - alex-3.1.7
@@ -63,7 +62,7 @@ matrix:
             - cabal-install-1.24
             - llvm-3.7-dev
 
-    - env: GHC=8.2.1 CABAL=2.0 LLVM=4.0.1
+    - env: GHC=8.2.2 CABAL=2.0 LLVM=4.0.1
       compiler: "GHC 8.2"
       addons:
         apt:
@@ -73,6 +72,16 @@ matrix:
             - cabal-install-2.0
             - llvm-4.0-dev
 
+    - env: GHC=8.4.1 CABAL=2.0 LLVM=5.0.1
+      compiler: "GHC 8.4"
+      addons:
+        apt:
+          sources: *apt_sources
+          packages:
+            - *apt_packages
+            - cabal-install-2.0
+            - llvm-5.0-dev
+
 before_install:
   - export PATH=/opt/cabal/$CABAL/bin:/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:$HOME/.cabal/bin:$PATH
   - source .travis/install-stack.sh
@@ -81,21 +90,12 @@ install:
   - echo "$(stack exec ghc -- --version) [$(stack exec ghc -- --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - cabal --version
   - stack --version
-  - llc --version; true
-  - opt --version; true
-  - |
-      if [ ${GHC} == head -o ! -e stack.yaml ]; then
-        travis_retry cabal install --only-dependencies || exit 1
-      else
-        travis_retry stack build --only-dependencies --fast --no-terminal --no-haddock-deps --ghc-options="-j +RTS -A128M -n4m -RTS" || exit 1
-      fi
+  - llc-${LLVM:0:3} --version; true
+  - opt-${LLVM:0:3} --version; true
+
+  - stack build --no-terminal --dry-run
+  - travis_retry stack build --only-dependencies --fast --no-terminal
 
 script:
-  - |
-      if [ ${GHC} == head -o ! -e stack.yaml ]; then
-        travis_retry cabal install || exit 1
-        travis_retry cabal haddock || exit 1
-      else
-        travis_retry stack build --fast --no-terminal --haddock --no-haddock-deps --ghc-options="-j +RTS -A128M -n4m -RTS" || exit 1
-      fi
+  - travis_retry stack build --fast --no-terminal --haddock --no-haddock-deps
 
diff --git a/repa-algorithms/repa-algorithms.cabal b/repa-algorithms/repa-algorithms.cabal
@@ -18,7 +18,7 @@ Synopsis:
 
 Library
   Build-Depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , vector               >= 0.11 && < 0.13
       , repa                 == 3.4.1.*
 

diff --git a/repa-examples/repa-examples.cabal b/repa-examples/repa-examples.cabal
@@ -25,7 +25,7 @@ Flag llvm
 
 Executable repa-canny
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
 
@@ -44,7 +44,7 @@ Executable repa-canny
 
 Executable repa-mmult
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , random               == 1.1.*
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
@@ -68,7 +68,7 @@ Executable repa-mmult
 
 Executable repa-laplace
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-io              == 3.4.1.*
       , template-haskell
@@ -89,7 +89,7 @@ Executable repa-laplace
 
 Executable repa-fft2d
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
       , repa-io              == 3.4.1.*
@@ -111,7 +111,7 @@ Executable repa-fft2d
 
 Executable repa-fft2d-highpass
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
       , repa-io              == 3.4.1.*
@@ -133,7 +133,7 @@ Executable repa-fft2d-highpass
 
 Executable repa-fft3d-highpass
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
 
@@ -154,7 +154,7 @@ Executable repa-fft3d-highpass
 
 Executable repa-blur
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
       , vector               >= 0.11 && < 0.13
@@ -175,7 +175,7 @@ Executable repa-blur
 
 Executable repa-sobel
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-algorithms      == 3.4.1.*
 
@@ -197,7 +197,7 @@ Executable repa-sobel
 
 Executable repa-volume
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , repa-io              == 3.4.1.*
 
@@ -217,7 +217,7 @@ Executable repa-volume
 
 Executable repa-unit-test
   Build-depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , repa                 == 3.4.1.*
       , QuickCheck           >= 2.8 && < 2.11
 

diff --git a/repa-io/repa-io.cabal b/repa-io/repa-io.cabal
@@ -18,7 +18,7 @@ Synopsis:
 
 Library
   Build-Depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , binary               >= 0.7 && < 0.9
       , bmp                  == 1.2.*
       , bytestring           == 0.10.*

diff --git a/repa/repa.cabal b/repa/repa.cabal
@@ -21,7 +21,7 @@ Synopsis:
 
 Library
   Build-Depends:
-        base                 >= 4.8 && < 4.11
+        base                 >= 4.8 && < 4.12
       , template-haskell
       , ghc-prim
       , vector               >= 0.11 && < 0.13

diff --git a/stack-8.4.yaml b/stack-8.4.yaml
@@ -0,0 +1,48 @@
+# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
+# vim: nospell
+
+resolver: ghc-8.4
+
+packages:
+- 'repa'
+- 'repa-io'
+- 'repa-algorithms'
+- 'repa-examples'
+
+# Packages to be pulled from upstream that are not in the resolver
+extra-deps:
+- 'bmp-1.2.6.3'
+- 'old-locale-1.0.0.7'
+- 'old-time-1.1.0.3'
+- 'primitive-0.6.3.0'
+- 'QuickCheck-2.10.1'
+- 'random-1.1'
+- 'tf-random-0.5'
+- 'vector-0.12.0.1'
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra global and per-package GHC options
+# ghc-options: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: >= 1.0.0
+
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor