Add support for LTS-15.0 (#137)

* Add support for LTS-15.0

* Add CPP for test suite

* Change header entry to "master"
This commit is contained in:
Esteban Ibarra 2020-03-18 21:02:15 -05:00 committed by GitHub
parent 924ece0da9
commit 54e749388f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 12 deletions

View File

@ -1,3 +1,7 @@
## master
### Changed
* Update upper bounds for `path` and `path-io` packages.
## 0.3.10.1
### Added
* Update Dockerfile and maintainer.

View File

@ -1,5 +1,5 @@
name: hapistrano
version: 0.3.10.1
version: 0.3.10.2
synopsis: A deployment library for Haskell applications
description:
.
@ -28,7 +28,7 @@ homepage: https://github.com/stackbuilders/hapistrano
bug-reports: https://github.com/stackbuilders/hapistrano/issues
build-type: Simple
cabal-version: >=1.18
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
extra-source-files: CHANGELOG.md
, README.md
, Dockerfile
@ -59,7 +59,7 @@ library
, gitrev >= 1.2 && < 1.4
, mtl >= 2.0 && < 3.0
, stm >= 2.0 && < 2.6
, path >= 0.5 && < 0.7
, path >= 0.5 && < 0.8
, process >= 1.4 && < 1.7
, typed-process >= 0.2 && < 0.3
, time >= 1.5 && < 1.10
@ -82,8 +82,8 @@ executable hap
, gitrev >= 1.2 && < 1.4
, hapistrano
, optparse-applicative >= 0.11 && < 0.16
, path >= 0.5 && < 0.7
, path-io >= 1.2 && < 1.5
, path >= 0.5 && < 0.8
, path-io >= 1.2 && < 1.7
, stm >= 2.4 && < 2.6
, yaml >= 0.8.16 && < 0.12
if flag(dev)
@ -107,8 +107,8 @@ test-suite test
, hapistrano
, hspec >= 2.0 && < 3.0
, mtl >= 2.0 && < 3.0
, path >= 0.5 && < 0.7
, path-io >= 1.2 && < 1.5
, path >= 0.5 && < 0.8
, path-io >= 1.2 && < 1.7
, process >= 1.4 && < 1.7
, QuickCheck >= 2.5.1 && < 3.0
, silently >= 1.2 && < 1.3

View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE TemplateHaskell #-}
module System.HapistranoSpec
@ -42,7 +43,11 @@ spec = do
expectedOutput `Hspec.shouldSatisfy` (`isPrefixOf` actualOutput)
describe "readScript" $
it "performs all the necessary normalizations correctly" $ do
#if MIN_VERSION_path_io(1,6,0)
let spath = $(mkRelFile "script/clean-build.sh")
#else
spath <- makeAbsolute $(mkRelFile "script/clean-build.sh")
#endif
(fmap Hap.unGenericCommand <$> Hap.readScript spath) `Hspec.shouldReturn`
[ "export PATH=~/.cabal/bin:/usr/local/bin:$PATH"
, "cabal sandbox delete"

View File

@ -1,3 +1,3 @@
resolver: lts-14.12
resolver: lts-15.0
packages:
- '.'

View File

@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
size: 545658
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/12.yaml
sha256: 26b807457213126d26b595439d705dc824dbb7618b0de6b900adc2bf6a059406
original: lts-14.12
size: 488576
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/0.yaml
sha256: e4b6a87b47ec1cf63a7f1a0884a3b276fce2b0d174a10e8753c4f618e7983568
original: lts-15.0