haskell-ci 0.10.1 → 0.10.2
raw patch · 4 files changed
+10/−5 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- CHANGELOG.md +5/−0
- haskell-ci.cabal +3/−3
- src/HaskellCI/Config/Doctest.hs +1/−1
- src/HaskellCI/Travis.hs +1/−1
CHANGELOG.md view
@@ -1,3 +1,8 @@+## 0.10.2 - 2020-06-05++- Bump default doctest version to 0.17+- Fix HCPKG variable in macOS builds [#395](https://github.com/haskell-CI/haskell-ci/issues/395)+ ## 0.10.1 - 2020-05-16 - Add version-info command to help debugging issues with `haskell-ci`
haskell-ci.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.2 name: haskell-ci-version: 0.10.1+version: 0.10.2 synopsis: Cabal package script generator for Travis-CI description: Script generator (@haskell-ci@) for [Travis-CI](https://travis-ci.org/) for continuous-integration testing of Haskell Cabal packages.@@ -155,7 +155,7 @@ -- other dependencies build-depends:- , aeson ^>=1.4.2.0+ , aeson ^>=1.4.2.0 || ^>=1.5.0.0 , base-compat ^>=0.11 , cabal-install-parsers ^>=0.3 , exceptions ^>=0.10.0@@ -200,5 +200,5 @@ build-depends: , ansi-terminal ^>=0.10 , Diff ^>=0.4.0- , tasty >=1.0 && <1.3+ , tasty >=1.0 && <1.4 , tasty-golden ^>=2.3.1.1
src/HaskellCI/Config/Doctest.hs view
@@ -23,7 +23,7 @@ deriving (Show, Generic) defaultDoctestVersion :: VersionRange-defaultDoctestVersion = majorBoundVersion (mkVersion [0,16,3])+defaultDoctestVersion = majorBoundVersion (mkVersion [0,17]) ------------------------------------------------------------------------------- -- Grammar
src/HaskellCI/Travis.hs view
@@ -140,7 +140,7 @@ let haskellOnMacos = "https://haskell.futurice.com/haskell-on-macos.py" unless (null cfgOsx) $ do sh $ "if [ \"$TRAVIS_OS_NAME\" = \"osx\" ]; then curl " ++ haskellOnMacos ++ " | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=3.2.0.0 install cabal-install-3.2.0.0 ${TRAVIS_COMPILER}; fi"- sh' [2034,2039] "if [ \"$TRAVIS_OS_NAME\" = \"osx\" ]; then HC=$HOME/.ghc-install/ghc/bin/$TRAVIS_COMPILER; WITHCOMPILER=\"-w $HC\"; HCPKG=${HC/ghc/ghc-pkg}; CABAL=$HOME/.ghc-install/ghc/bin/cabal; fi"+ sh' [2034,2039] "if [ \"$TRAVIS_OS_NAME\" = \"osx\" ]; then HC=$HOME/.ghc-install/ghc/bin/$TRAVIS_COMPILER; WITHCOMPILER=\"-w $HC\"; HCPKG=$HOME/.ghc-install/ghc/bin/${TRAVIS_COMPILER/ghc/ghc-pkg}; CABAL=$HOME/.ghc-install/ghc/bin/cabal; fi" -- HCNUMVER, numeric HC version, e.g. ghc 7.8.4 is 70804 and 7.10.3 is 71003 sh "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')" sh "echo $HCNUMVER"