Skip to content

Commit 5310b81

Browse files
committed
Update .travis.yml etc
1 parent ae6ea15 commit 5310b81

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

.stylish-haskell.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ steps:
1111
- trailing_whitespace: {}
1212
columns: 80
1313
language_extensions:
14+
- DataKinds
1415
- EmptyCase
1516
- ExplicitForAll
1617
- FlexibleContexts

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.9.20200325
7+
# version: 0.9.20200326
88
#
99
version: ~> 1.0
1010
language: c
@@ -116,6 +116,8 @@ install:
116116
- touch cabal.project
117117
- |
118118
echo "packages: ." >> cabal.project
119+
- if [ $HCNUMVER -ge 80000 ] ; then echo 'package some' >> cabal.project ; fi
120+
- "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
119121
- |
120122
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(some)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
121123
- cat cabal.project || true
@@ -141,6 +143,8 @@ script:
141143
- touch cabal.project
142144
- |
143145
echo "packages: ${PKGDIR_some}" >> cabal.project
146+
- if [ $HCNUMVER -ge 80000 ] ; then echo 'package some' >> cabal.project ; fi
147+
- "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
144148
- |
145149
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(some)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
146150
- cat cabal.project || true
@@ -167,5 +171,5 @@ script:
167171
# Constraint set unsafe
168172
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='some +newtype-unsafe' all
169173

170-
# REGENDATA ("0.9.20200325",["--config=cabal.haskell-ci","cabal.project"])
174+
# REGENDATA ("0.9.20200326",["--config=cabal.haskell-ci","cabal.project"])
171175
# EOF

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Patches welcome!
77
- Regenerate `.travis.yml` with `haskell-ci regenerate` (get the latest from [GitHub haskell-ci/haskell-ci](https://github.com/haskell-ci/haskell-ci))
88

99
- Don't edit `CHANGELOG.md`, rather include a copyable entry in your pull request description. I often process pull requests in bulk, and everyone editing the `CHANGELOG.md` causes unnecessary conflicts.
10+
- For the same reason, do not edit `version` or `x-revision`
1011

1112
- I use [`stylish-haskell`](https://github.com/jaspervdj/stylish-haskell) to format imports. I encourage you to use it too, when contributing.
1213
- General code style is 4 spaces, just look around how it looks, it's not so strict.

src/Data/GADT/DeepSeq.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{-# LANGUAGE CPP #-}
1+
{-# LANGUAGE CPP #-}
22
#if __GLASGOW_HASKELL__ >= 704
3-
{-# LANGUAGE Safe #-}
3+
{-# LANGUAGE Safe #-}
44
#elif __GLASGOW_HASKELL__ >= 702
5-
{-# LANGUAGE Trustworthy #-}
5+
{-# LANGUAGE Trustworthy #-}
66
#endif
77
module Data.GADT.DeepSeq (
88
GNFData (..),

src/Data/GADT/Show.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{-# LANGUAGE CPP #-}
22
#if __GLASGOW_HASKELL__ >= 704
3-
{-# LANGUAGE Safe #-}
3+
{-# LANGUAGE Safe #-}
44
#elif __GLASGOW_HASKELL__ >= 702
5-
{-# LANGUAGE Trustworthy #-}
5+
{-# LANGUAGE Trustworthy #-}
66
#endif
77
module Data.GADT.Show (
88
-- * Showing

0 commit comments

Comments
 (0)