Update docs and integration tests to use LTS 6

ljli · May 31, 2016 · c8cd107 · c8cd107
1 parent 7f7cead
commit c8cd107
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 28 deletions.
diff --git a/doc/GUIDE.md b/doc/GUIDE.md
@@ -1925,7 +1925,7 @@ matrix:
     compiler: ": #stack 7.10.2"
     addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
 
-  - env: BUILD=stack ARGS="--resolver lts-5"
+  - env: BUILD=stack ARGS="--resolver lts-6"
     compiler: ": #stack 7.10.3"
     addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
 
@@ -1947,7 +1947,7 @@ matrix:
     compiler: ": #stack 7.10.2 osx"
     os: osx
 
-  - env: BUILD=stack ARGS="--resolver lts-5"
+  - env: BUILD=stack ARGS="--resolver lts-6"
     compiler: ": #stack 7.10.3 osx"
     os: osx
 

diff --git a/etc/docker/stack-base/Dockerfile b/etc/docker/stack-base/Dockerfile
@@ -43,7 +43,7 @@ RUN rm $HOME/.gnupg/*.asc $HOME/.gnupg/trust
 
 # INSTALL STACK, BOOTSTRAP LTS & GHC & UNINSTALL STACK
 RUN bash -lc 'nix-env -i stack ghc'
-RUN bash -lc 'stack setup --resolver=lts-5.15'
+RUN bash -lc 'stack setup --resolver=lts-6.0'
 
 # SET THE DEFAULT PROFILE TO GPG 1.4
 RUN bash -lc 'nix-env -S /nix/var/nix/profiles/gpg14'

diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
@@ -159,7 +159,7 @@ rules global@Global{..} args = do
                     ["--local-bin-path=" ++ tmpDir]
             () <- cmd0 $ concat $ concat
                 [["install --pedantic --no-haddock-deps"], [" --haddock" | gTestHaddocks]]
-            () <- cmd0 "install --resolver=lts-5.0 cabal-install"
+            () <- cmd0 "install --resolver=lts-6.0 cabal-install"
             let cmd' = cmd (AddPath [tmpDir] []) stackProgName (stackArgs global) gBuildArgs
             () <- cmd' "test --pedantic --flag stack:integration-tests"
             return ()

diff --git a/etc/scripts/stack.yaml b/etc/scripts/stack.yaml
@@ -1 +1 @@
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/stack.cabal b/stack.cabal
@@ -151,7 +151,7 @@ library
                    , binary-tagged >= 0.1.1
                    , blaze-builder
                    , byteable
-                   , bytestring
+                   , bytestring >= 0.10.4.0
                    , conduit >= 1.2.4
                    , conduit-extra >= 1.1.7.1
                    , containers >= 0.5.5.1
@@ -241,9 +241,9 @@ executable stack
                 , base >=4.7 && < 5
                 , bytestring >= 0.10.4.0
                 , containers >= 0.5.5.1
-                , directory
+                , directory >= 1.2.1.0
                 , filelock >= 0.1.0.1
-                , filepath
+                , filepath >= 1.3.0.2
                 , hpack
                 , http-client
                 , lifted-base
@@ -290,7 +290,7 @@ test-suite stack-test
                 , conduit-extra
                 , containers >= 0.5.5.1
                 , cryptohash
-                , directory
+                , directory >= 1.2.1.0
                 , exceptions
                 , hspec <2.3
                 , http-conduit
@@ -323,12 +323,12 @@ test-suite stack-integration-test
 
   build-depends:  async < 2.2
                 , base >= 4.7 && < 5
-                , bytestring
+                , bytestring >= 0.10.4.0
                 , conduit
                 , conduit-extra
                 , containers >= 0.5.5.1
-                , directory
-                , filepath
+                , directory >= 1.2.1.0
+                , filepath >= 1.3.0.2
                 , hspec < 2.3
                 , process >= 1.2.0.0 && < 1.5
                 , resourcet

diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs
@@ -129,4 +129,4 @@ isMacOSX = os == "darwin"
 -- version is released, pass this argument to @stack@ when running in
 -- a global context.  The LTS major version here should match that of
 -- the main @stack.yaml@.
-defaultResolverArg = "--resolver=lts-5"
+defaultResolverArg = "--resolver=lts-6.0"
diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml
@@ -1,3 +1,3 @@
-resolver: lts-5.11
+resolver: lts-6.0
 drop-packages:
-- zlib
+- zlib
diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-5.0
+resolver: lts-6.0
 packages:
 - '.'
 extra-deps: []

diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml
@@ -1,4 +1,4 @@
 packages:
 - https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-5.0
+resolver: lts-6.0
 extra-deps:
 - bytestring-0.10.6.0
 packages:

diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0
diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
@@ -1,2 +1,2 @@
-resolver: lts-5.0
+resolver: lts-6.0
 packages: []
diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
@@ -1,3 +1,3 @@
-resolver: lts-5.0
+resolver: lts-6.0
 packages:
 - auto-update-0.1.2.1
diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml
@@ -4,4 +4,4 @@ packages:
 - sub-package
 - cyclic
 extra-deps: []
-resolver: lts-5.0
+resolver: lts-6.0