travis uses stack, change bounds on dependencies

Author: hyperthunk

.travis.yml

@@ -4,47 +4,30 @@ sudo: false
 
 matrix:
   include:
-<<<<<<< HEAD
-=======
-    - env: CABALVER=1.22 GHCVER=7.6.3
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.6.3], sources: [hvr-ghc]}}
->>>>>>> f571d3d4ced2f1d9caffdc08d80eade5cb0f061d
-    - env: CABALVER=1.22 GHCVER=7.8.4
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.8.4], sources: [hvr-ghc]}}
-    - env: CABALVER=1.22 GHCVER=7.10.3
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}
+  - env: ARGS="--stack-yaml stack-ghc-7.10.3.yaml" COVER="" GHCVER=7.10.3
+    addons: {apt: {packages: [libgmp-dev]}}
+  - env: ARGS="--stack-yaml stack-ghc-8.0.1.yaml" COVER="" GHCVER=8.0.1
+    addons: {apt: {packages: [libgmp-dev]}}
+  - env: ARGS="--resolver nightly" COVER="" GHCVER=latest
+    addons: {apt: {packages: [libgmp-dev]}}
+
+cache:
+  directories:
+  - $HOME/.stack
+  - $HOME/.local
 
 before_install:
-<<<<<<< HEAD
-  - mkdir -p ~/.local/bin
-  - export PATH=~/.local/bin:$PATH
-  - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar -xzO --wildcards '*/stack' > ~/.local/bin/stack
-  - chmod a+x ~/.local/bin/stack
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+- export PATH=$HOME/.local/bin:$HOME/.cabal/bin:$PATH
+- mkdir -p ~/.local/bin
+- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+- stack --version
 
 install:
-  - stack -j 2 setup --no-terminal --no-install-ghc --skip-ghc-check
-  - stack -j 2 build --only-snapshot --no-terminal --system-ghc --skip-ghc-check
+- stack ${ARGS} setup --no-terminal
 
 script:
-  - stack -j 2 test --no-terminal --system-ghc
+- stack ${ARGS} test --test-arguments='--plain'
 
 notifications:
   slack:
     secure: g0NP1tkOe3+kI6O0Q1mgT/jPaLjxQ31J26MWouicu2F1Y3p73qTvv/QsOkafRMZDn07HlzgviCP25r7Ytg32pUAFvOh4U4MT2MpO0jUVVGPi4ZiwB+W5AH+HlDtJSickeSZ0AjXZSaGv8nQNegWkeaLQgLBIzrTHU8s0Y9K+whQ=
-
-=======
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:~/.cabal/bin:$PATH
-  - ghc --version
-  - cabal --version
-  - cabal update
-  # workaround for https://ghc.haskell.org/trac/ghc/ticket/9221
-  # taken from https://github.com/hvr/multi-ghc-travis/blob/0fa68f78c2b1b059f904c9abc85510a3bb4f57e2/README.md
-  - sed -i 's/^jobs:/-- jobs:/' $HOME/.cabal/config
-
-install:
-  - cabal install --only-dependencies --enable-tests
-
-script:
-  - cabal test
->>>>>>> f571d3d4ced2f1d9caffdc08d80eade5cb0f061d

distributed-process-async.cabal

@@ -31,14 +31,10 @@ library
   build-depends:
                    base >= 4.4 && < 5,
                    data-accessor >= 0.2.2.3,
-<<<<<<< HEAD
                    distributed-process >= 0.6.1 && < 0.7,
-                   distributed-process-extras >= 0.2.1.2 && < 0.3,
-                   binary >= 0.6.3.0 && < 0.8,
-=======
-                   distributed-process >= 0.5.3 && < 0.7,
+                   distributed-process-extras >= 0.3.0 && < 0.4,
+                   exceptions >= 0.8.2.1 && < 0.9,
                    binary >= 0.6.3.0 && < 0.9,
->>>>>>> f571d3d4ced2f1d9caffdc08d80eade5cb0f061d
                    deepseq >= 1.3.0.1 && < 1.5,
                    mtl,
                    containers >= 0.4 && < 0.6,
@@ -63,14 +59,11 @@ test-suite AsyncTests
   build-depends:
                    base >= 4.4 && < 5,
                    ansi-terminal >= 0.5 && < 0.7,
-<<<<<<< HEAD
                    distributed-process >= 0.6.1 && < 0.7,
-                   distributed-process-extras >= 0.2.1.2 && < 0.3,
-=======
-                   distributed-process >= 0.5.3 && < 0.7,
->>>>>>> f571d3d4ced2f1d9caffdc08d80eade5cb0f061d
+                   distributed-process-extras >= 0.3.0 && < 0.4,
                    distributed-process-async,
-                   distributed-process-systest >= 0.1.0 && < 0.2.0,                
+                   distributed-process-systest >= 0.1.0 && < 0.2.0,
+                   exceptions >= 0.8.2.1 && < 0.9,
                    network >= 2.5 && < 2.7,
                    network-transport >= 0.4 && < 0.5,
                    network-transport-tcp >= 0.4 && < 0.6,

stack-ghc-7.10.3.yaml

@@ -0,0 +1,12 @@
+resolver: nightly-2016-03-08
+
+packages:
+- '.'
+- location:
+    git: https://github.com/haskell-distributed/distributed-process-systest.git
+    commit: 6b8749fd38141425e6b677d5a5137b3fe09cc127
+  extra-dep: true
+
+extra-deps:
+- distributed-process-0.6.6         # missing snapshot
+- distributed-process-extras-0.3.0  # missing snapshot

stack-ghc-8.0.1.yaml

@@ -0,0 +1,15 @@
+# Specifies the GHC version and set of packages available
+resolver: lts-7.14
+
+# Local packages, usually specified by relative directory name
+packages:
+- '.'
+
+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
+extra-deps:
+- distributed-process-0.6.6
+- distributed-process-extras-0.3.0
+- distributed-process-systest-0.1.1
+
+# Override default flag values for local packages and extra-deps
+flags: {}

stack.yaml

@@ -1,5 +1,5 @@
 # Specifies the GHC version and set of packages available
-resolver: lts-7.14
+resolver: nightly-2017-02-03
 
 # Local packages, usually specified by relative directory name
 packages:
@@ -10,6 +10,7 @@ extra-deps:
 - distributed-process-0.6.6
 - distributed-process-extras-0.3.0
 - distributed-process-systest-0.1.1
+- rematch-0.2.0.0
 
 # Override default flag values for local packages and extra-deps
 flags: {}