Skip to content

Commit 5429599

Browse files
committed
test with GHC 8.2, 8.4, 8.6
1 parent 5129257 commit 5429599

File tree

8 files changed

+23
-51
lines changed

8 files changed

+23
-51
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
dist/
2+
.stack-work/
23
*.c
34
*.cpp
45
*.d

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ addons:
1212
- libgsl0-dev
1313
- libcairo2-dev
1414

15-
# The different configurations we want to test. You could also do things like
16-
# change flags or use --stack-yaml to point to a different file.
1715
env:
18-
# right now the gsl example does not work, because gtk2hs-buildtools does
19-
# not seem to work with the latest cabal lib
20-
# TODO test this again
21-
- ARGS=""
16+
- ARGS="--flag inline-c:gsl-example"
17+
- ARGS="--stack-yaml stack-lts-12.14.yaml --flag inline-c:gsl-example"
18+
# gtk2hs-buildtools is not present in nightly a bit of a pain to install,
19+
# skip it for now
20+
- ARGS="--stack-yaml stack-nightly-2018-10-24.yaml"
2221

2322
before_install:
2423
# Download and unpack the stack executable

inline-c-cpp/inline-c-cpp.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ author: Francesco Mazzoli
99
maintainer: [email protected]
1010
copyright: (c) 2015-2016 FP Complete Corporation, (c) 2017-2018 Francesco Mazzoli
1111
category: FFI
12-
tested-with: GHC == 8.2.1
12+
tested-with: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1
1313
build-type: Simple
1414
cabal-version: >=1.10
1515

inline-c/examples/gsl-ode.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ import qualified Language.C.Inline as C
1717
import qualified Language.C.Inline.Unsafe as CU
1818
import System.IO.Unsafe (unsafePerformIO)
1919

20-
#if __GLASGOW_HASKELL__ < 710
21-
import Data.Functor ((<$>))
22-
#endif
23-
2420
C.context (C.baseCtx <> C.vecCtx <> C.funCtx)
2521

2622
C.include "<gsl/gsl_errno.h>"

inline-c/inline-c.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Francesco Mazzoli, Mathieu Boespflug
88
maintainer: [email protected]
99
copyright: (c) 2015-2016 FP Complete Corporation, (c) 2017-2018 Francesco Mazzoli
1010
category: FFI
11-
tested-with: GHC == 8.2.1
11+
tested-with: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1
1212
build-type: Simple
1313
cabal-version: >=1.10
1414
Extra-Source-Files: README.md, changelog.md

stack-lts-12.14.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
resolver: lts-12.14
2+
packages:
3+
- inline-c
4+
- inline-c-cpp
5+
- sample-cabal-project
6+
extra-deps:
7+
- Chart-1.9@sha256:f41568b6b3704f66c2ec163295b430ab7d798f91de426c2d5aba747d1135cd9b
8+
- Chart-cairo-1.9@sha256:82875639be230c9406dbea650647b2dc94b11060160d6dad2c98551bb23d544f
9+

stack-nightly-2018-10-24.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resolver: nightly-2018-10-24
2+
packages:
3+
- inline-c
4+
- inline-c-cpp
5+
- sample-cabal-project

stack.yaml

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,5 @@
1-
resolver: ghc-8.2.1
1+
resolver: lts-11.22
22
packages:
33
- inline-c
44
- inline-c-cpp
55
- sample-cabal-project
6-
extra-deps:
7-
- QuickCheck-2.10.0.1
8-
- ansi-wl-pprint-0.6.8
9-
- hashable-1.2.6.1
10-
- mtl-2.2.1
11-
- parsec-3.1.11
12-
- parsers-0.12.5
13-
- unordered-containers-0.2.8.0
14-
- vector-0.12.0.1
15-
- ansi-terminal-0.6.3.1
16-
- attoparsec-0.13.1.0
17-
- base-orphans-0.6
18-
- cabal-doctest-1.0.2
19-
- charset-0.3.7.1
20-
- primitive-0.6.2.0
21-
- random-1.1
22-
- scientific-0.3.5.1
23-
- text-1.2.2.2
24-
- tf-random-0.5
25-
- integer-logarithms-1.0.2
26-
- semigroups-0.18.3
27-
# for tests
28-
- hspec-2.4.4
29-
- raw-strings-qq-1.1
30-
- regex-posix-0.95.2
31-
- HUnit-1.6.0.0
32-
- call-stack-0.1.0
33-
- hspec-core-2.4.4
34-
- hspec-discover-2.4.4
35-
- hspec-expectations-0.8.2
36-
- regex-base-0.93.2
37-
- async-2.1.1.1
38-
- quickcheck-io-0.2.0
39-
- setenv-0.1.1.3
40-
- stm-2.4.4.1
41-
- safe-exceptions-0.1.6.0
42-
- exceptions-0.8.3
43-
- transformers-compat-0.5.1.4

0 commit comments

Comments
 (0)