[#13] Build with GHC-8.8 (#14)

Resolves #13
This commit is contained in:
Dmitrii Kovanikov 2019-08-29 07:51:16 +03:00 committed by Veronika Romashkina
parent 36149eb0eb
commit 7f7542c0f8
6 changed files with 17 additions and 20 deletions

View File

@ -4,7 +4,7 @@ language: haskell
git: git:
depth: 5 depth: 5
cabal: "2.4" cabal: "3.0"
cache: cache:
directories: directories:
@ -14,9 +14,9 @@ cache:
matrix: matrix:
include: include:
- ghc: 8.2.2
- ghc: 8.4.4 - ghc: 8.4.4
- ghc: 8.6.5 - ghc: 8.6.5
- ghc: 8.8.1
- ghc: 8.6.5 - ghc: 8.6.5
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml" env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
@ -24,8 +24,8 @@ matrix:
install: install:
- | - |
if [ -z "$STACK_YAML" ]; then if [ -z "$STACK_YAML" ]; then
cabal new-update cabal update
cabal new-build --enable-tests --enable-benchmarks cabal build --enable-tests --enable-benchmarks
else else
curl -sSL https://get.haskellstack.org/ | sh curl -sSL https://get.haskellstack.org/ | sh
stack --version stack --version
@ -37,7 +37,7 @@ script:
- curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint . - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint .
- | - |
if [ -z "$STACK_YAML" ]; then if [ -z "$STACK_YAML" ]; then
cabal new-test cabal test
else else
stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror
fi fi

View File

@ -3,10 +3,14 @@
`shellmet` uses [PVP Versioning][1]. `shellmet` uses [PVP Versioning][1].
The changelog is available [on GitHub][2]. The changelog is available [on GitHub][2].
## Unreleased ## Unreleased: 0.0.3.0
* [#10](https://github.com/kowainik/shellmet/issues/10): * [#10](https://github.com/kowainik/shellmet/issues/10):
Add doctest. Add doctest.
(by [@vrom911](https://github.com/vrom911))
* [#13](https://github.com/kowainik/shellmet/issues/13):
Support GHC-8.8.1. Drop support for GHC-8.2.2.
(by [@chshersh](https://github.com/chshersh))
## 0.0.2.0 — Jul 4, 2019 ## 0.0.2.0 — Jul 4, 2019

View File

@ -2,9 +2,9 @@
[![Build status](https://img.shields.io/travis/kowainik/shellmet.svg?logo=travis)](https://travis-ci.org/kowainik/shellmet) [![Build status](https://img.shields.io/travis/kowainik/shellmet.svg?logo=travis)](https://travis-ci.org/kowainik/shellmet)
[![Hackage](https://img.shields.io/hackage/v/shellmet.svg?logo=haskell)](https://hackage.haskell.org/package/shellmet) [![Hackage](https://img.shields.io/hackage/v/shellmet.svg?logo=haskell)](https://hackage.haskell.org/package/shellmet)
[![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE)
[![Stackage Lts](http://stackage.org/package/shellmet/badge/lts)](http://stackage.org/lts/package/shellmet) [![Stackage Lts](http://stackage.org/package/shellmet/badge/lts)](http://stackage.org/lts/package/shellmet)
[![Stackage Nightly](http://stackage.org/package/shellmet/badge/nightly)](http://stackage.org/nightly/package/shellmet) [![Stackage Nightly](http://stackage.org/package/shellmet/badge/nightly)](http://stackage.org/nightly/package/shellmet)
[![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE)
Out of the shell solution for scripting in Haskell. Shellmet provides an easy and Out of the shell solution for scripting in Haskell. Shellmet provides an easy and
convenient way to call shell commands from Haskell programs. convenient way to call shell commands from Haskell programs.
@ -15,7 +15,7 @@ This README contains the usage example of the `shellmet` library. The example is
runnable. You can build and execute with the following command: runnable. You can build and execute with the following command:
```shell ```shell
cabal new-run readme cabal run readme
``` ```
### Setting up ### Setting up
@ -26,7 +26,6 @@ necessary pragmas and imports.
```haskell ```haskell
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
import Data.Semigroup ((<>))
import Shellmet (($|)) import Shellmet (($|))
import qualified Data.Text as T import qualified Data.Text as T

View File

@ -1,6 +1,6 @@
cabal-version: 2.4 cabal-version: 2.4
name: shellmet name: shellmet
version: 0.0.2.0 version: 0.0.3.0
synopsis: Out of the shell solution for scripting in Haskell synopsis: Out of the shell solution for scripting in Haskell
description: Shellmet provides easy and convenient way to call shell commands from Haskell programs description: Shellmet provides easy and convenient way to call shell commands from Haskell programs
homepage: https://github.com/kowainik/shellmet homepage: https://github.com/kowainik/shellmet
@ -14,16 +14,16 @@ category: Shell, Command Line
build-type: Simple build-type: Simple
extra-doc-files: README.md extra-doc-files: README.md
, CHANGELOG.md , CHANGELOG.md
tested-with: GHC == 8.2.2 tested-with: GHC == 8.4.4
GHC == 8.4.4
GHC == 8.6.5 GHC == 8.6.5
GHC == 8.8.1
source-repository head source-repository head
type: git type: git
location: https://github.com/kowainik/shellmet.git location: https://github.com/kowainik/shellmet.git
common common-options common common-options
build-depends: base >= 4.10.1.0 && < 4.13 build-depends: base >= 4.11 && < 4.14
ghc-options: -Wall ghc-options: -Wall
-Wincomplete-uni-patterns -Wincomplete-uni-patterns

View File

@ -1 +1 @@
resolver: lts-13.21 resolver: lts-14.3

View File

@ -1,12 +1,9 @@
{-# LANGUAGE CPP #-}
module Main (main) where module Main (main) where
import System.FilePath.Glob (glob) import System.FilePath.Glob (glob)
import Test.DocTest (doctest) import Test.DocTest (doctest)
main :: IO () main :: IO ()
#if ( __GLASGOW_HASKELL__ >= 804 )
main = do main = do
sourceFiles <- glob "src/**/*.hs" sourceFiles <- glob "src/**/*.hs"
doctest doctest
@ -14,6 +11,3 @@ main = do
: "-XOverloadedStrings" : "-XOverloadedStrings"
: "-XScopedTypeVariables" : "-XScopedTypeVariables"
: sourceFiles : sourceFiles
#else
main = pure ()
#endif