diff --git a/.travis.yml b/.travis.yml index 71c42d0..fe1cfc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,32 +3,18 @@ env: # We use CABALVER=1.22 everywhere because it uses the flag --enable-coverage # instead of --enable-library-coverage used by older versions. - - GHCVER=7.6.3 CABALVER=1.22 MONGO=2.4.14 - - GHCVER=7.8.4 CABALVER=1.22 MONGO=2.4.14 - - GHCVER=7.10.3 CABALVER=1.22 MONGO=2.4.14 - - GHCVER=8.0.2 CABALVER=1.22 MONGO=2.4.14 - - GHCVER=7.6.3 CABALVER=1.22 MONGO=2.6.12 - GHCVER=7.8.4 CABALVER=1.22 MONGO=2.6.12 - GHCVER=7.10.3 CABALVER=1.22 MONGO=2.6.12 - - GHCVER=8.0.2 CABALVER=1.22 MONGO=2.6.12 - - GHCVER=7.6.3 CABALVER=1.22 MONGO=3.0.12 + - GHCVER=8.0.2 CABALVER=1.24 MONGO=2.6.12 - GHCVER=7.8.4 CABALVER=1.22 MONGO=3.0.12 - GHCVER=7.10.3 CABALVER=1.22 MONGO=3.0.12 - - GHCVER=8.0.2 CABALVER=1.22 MONGO=3.0.12 - - GHCVER=7.6.3 CABALVER=1.22 MONGO=3.2.6 + - GHCVER=8.0.2 CABALVER=1.24 MONGO=3.0.12 - GHCVER=7.8.4 CABALVER=1.22 MONGO=3.2.6 - GHCVER=7.10.3 CABALVER=1.22 MONGO=3.2.6 - - GHCVER=8.0.2 CABALVER=1.22 MONGO=3.2.6 - - GHCVER=7.6.3 CABALVER=1.22 MONGO=3.4.3 + - GHCVER=8.0.2 CABALVER=1.24 MONGO=3.2.6 - GHCVER=7.8.4 CABALVER=1.22 MONGO=3.4.3 - GHCVER=7.10.3 CABALVER=1.22 MONGO=3.4.3 - - GHCVER=8.0.2 CABALVER=1.22 MONGO=3.4.3 - - GHCVER=head CABALVER=head MONGO=3.4.3 - -matrix: - allow_failures: - # The text here should match the last line above exactly. - - env: GHCVER=head CABALVER=head MONGO=3.4.3 + - GHCVER=8.0.2 CABALVER=1.24 MONGO=3.4.3 before_install: @@ -39,6 +25,8 @@ before_install: - cabal --version - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 + - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 + - echo "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list - echo "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list - echo "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list - echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list diff --git a/test/TestImport.hs b/test/TestImport.hs index ad15152..4150367 100644 --- a/test/TestImport.hs +++ b/test/TestImport.hs @@ -17,6 +17,7 @@ import qualified Data.Time as Time import Data.Time.Format (defaultTimeLocale, iso8601DateFormat) #else import System.Locale (defaultTimeLocale, iso8601DateFormat) +import Data.Maybe (fromJust) #endif parseTime :: ParseTime t => String -> String -> t