Skip to content
Snippets Groups Projects
Commit fda396c7 authored by Ashley Yakeley's avatar Ashley Yakeley
Browse files

Merge branch '1.10'

parents c56a827e 492d8ae7
No related branches found
No related tags found
No related merge requests found
...@@ -10,23 +10,21 @@ before_cache: ...@@ -10,23 +10,21 @@ before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
# Test with the latest version of each X.Y version
matrix: matrix:
include: include:
- env: CABALVER=1.18 GHCVER=7.8.4
compiler: ": #GHC 7.8.4"
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
- env: CABALVER=1.22 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.1
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.2 - env: CABALVER=1.24 GHCVER=8.0.2
compiler: ": #GHC 8.0.2" compiler: ": #GHC 8.0.2" # released 2017-01-11
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}} addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
- env: CABALVER=2.0 GHCVER=8.2.2 - env: CABALVER=2.0 GHCVER=8.2.2
compiler: ": #GHC 8.2.2" compiler: ": #GHC 8.2.2" # released 2017-11-21
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}} addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
- env: CABALVER=2.0 GHCVER=8.4.4
compiler: ": #GHC 8.4.4" # released 2018-10-14
addons: {apt: {packages: [cabal-install-2.0,ghc-8.4.4], sources: [hvr-ghc]}}
- env: CABALVER=2.0 GHCVER=8.6.5
compiler: ": #GHC 8.6.5" # released 2019-04-23
addons: {apt: {packages: [cabal-install-2.0,ghc-8.6.5], sources: [hvr-ghc]}}
before_install: before_install:
- unset CC - unset CC
......
...@@ -12,7 +12,7 @@ description: Time, clocks and calendars ...@@ -12,7 +12,7 @@ description: Time, clocks and calendars
category: Time category: Time
build-type: Configure build-type: Configure
cabal-version: >=1.10 cabal-version: >=1.10
tested-with: GHC == 8.0.1, GHC == 7.10.3, GHC == 7.8.4 tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5
x-follows-version-policy: x-follows-version-policy:
extra-source-files: extra-source-files:
...@@ -45,7 +45,7 @@ library ...@@ -45,7 +45,7 @@ library
ghc-options: -Wall -fwarn-tabs ghc-options: -Wall -fwarn-tabs
c-sources: lib/cbits/HsTime.c c-sources: lib/cbits/HsTime.c
build-depends: build-depends:
base >= 4.7 && < 5, base >= 4.9 && < 5,
deepseq >= 1.1 deepseq >= 1.1
if os(windows) if os(windows)
build-depends: Win32 build-depends: Win32
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment