Skip to content

Commit 96f9f1e

Browse files
author
qz
committed
tests fix, removed builds for 7.10 / 8.0, pg 10, travis xenial base image
1 parent 14af3ff commit 96f9f1e

File tree

5 files changed

+4
-43
lines changed

5 files changed

+4
-43
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use new container infrastructure to enable caching
2-
dist: trusty
2+
dist: xenial
33
sudo: false
44

55
# Do not choose a language; we provide our own build tools.
@@ -8,8 +8,6 @@ language: generic
88
os:
99
- linux
1010
env:
11-
- STACK_YAML=stack-ghc7.10.3.yaml
12-
- STACK_YAML=stack-ghc8.0.2.yaml
1311
- STACK_YAML=stack-ghc8.2.2.yaml
1412
- STACK_YAML=stack-ghc8.4.4.yaml
1513
- STACK_YAML=stack-ghc8.6.3.yaml
@@ -27,7 +25,7 @@ addons:
2725
apt:
2826
packages:
2927
- libgmp-dev
30-
postgresql: "9.6"
28+
postgresql: "10"
3129

3230
before_install:
3331
# Download and unpack the stack executable

stack-ghc7.10.3.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

stack-ghc8.0.2.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

tests/Driver.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Data.Foldable
55
import Control.Monad
66
import Data.Maybe
77
import Data.Int
8-
import Data.Either
8+
import Data.Either hiding (fromRight)
99
import qualified Data.ByteString as B
1010
import qualified Data.ByteString.Lazy as BL
1111
import qualified Data.ByteString.Char8 as BS

tests_connection/test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ testConnection name confContent = testCase name $ withPghba confContent $
3939
}
4040

4141
pghbaFilename :: FilePath
42-
pghbaFilename = "/etc/postgresql/9.5/main/pg_hba.conf"
42+
pghbaFilename = "/etc/postgresql/10/main/pg_hba.conf"
4343

4444
withPghba :: B.ByteString -> IO a -> IO a
4545
withPghba confContent action = do

0 commit comments

Comments
 (0)