Commit 94959ca Jaro Reinders
committed
1 parent 4cf5289 commit 94959ca Copy full SHA for 94959ca
File tree 6 files changed +61
-21
lines changed
6 files changed +61
-21
lines changed Original file line number Diff line number Diff line change @@ -11,8 +11,12 @@ cache:
11
11
12
12
matrix :
13
13
include :
14
- - env : RESOLVER="lts-8"
15
14
- env : RESOLVER="lts-9"
15
+ addons :
16
+ apt :
17
+ packages :
18
+ - libpango1.0-dev
19
+ - libgtk2.0-dev
16
20
- env : RESOLVER="nightly"
17
21
allow_failures :
18
22
- env : RESOLVER="nightly"
@@ -25,8 +29,16 @@ before_install:
25
29
26
30
install :
27
31
# install dependencies of yi-core separately to safe memory
28
- - stack --no-terminal --install-ghc --resolver $RESOLVER test yi-core --only-dependencies
29
- - stack --no-terminal --install-ghc --resolver $RESOLVER test --only-dependencies
32
+ - stack test yi-core --no-terminal
33
+ --install-ghc
34
+ --stack-yaml $RESOLVER.yaml
35
+ --resolver $RESOLVER
36
+ --only-dependencies
37
+ - stack test --no-terminal
38
+ --install-ghc
39
+ --stack-yaml $RESOLVER.yaml
40
+ --resolver $RESOLVER
41
+ --only-dependencies
30
42
31
43
script :
32
- - stack --no-terminal --resolver $RESOLVER test
44
+ - stack --no-terminal --stack-yaml $RESOLVER.yaml -- resolver $RESOLVER test
Original file line number Diff line number Diff line change
1
+ packages :
2
+ - yi-core
3
+ - yi-dynamic-configuration
4
+ - yi-frontend-vty
5
+ - yi-frontend-pango
6
+ - yi-fuzzy-open
7
+ - yi-keymap-cua
8
+ - yi-keymap-emacs
9
+ - yi-keymap-vim
10
+ - yi-mode-haskell
11
+ - yi-mode-javascript
12
+ - yi-misc-modes
13
+ - yi-intero
14
+ - yi-ireader
15
+ - yi-language
16
+ - yi-snippet
17
+ - yi
18
+ extra-deps :
19
+ - yi-rope-0.10
20
+ resolver : lts-9.8
Original file line number Diff line number Diff line change
1
+ resolver : nightly-2017-10-11
2
+
3
+ packages :
4
+ - yi-core
5
+ - yi-dynamic-configuration
6
+ - yi-frontend-vty
7
+ # - yi-frontend-pango
8
+ - yi-fuzzy-open
9
+ - yi-keymap-cua
10
+ - yi-keymap-emacs
11
+ - yi-keymap-vim
12
+ - yi-mode-haskell
13
+ - yi-mode-javascript
14
+ - yi-misc-modes
15
+ - yi-ireader
16
+ - yi-language
17
+ - yi-snippet
18
+ - yi
Original file line number Diff line number Diff line change 1
- resolver : nightly-2017-08-20
1
+ resolver : nightly-2017-10-11
2
2
3
3
packages :
4
4
- yi-core
@@ -15,14 +15,4 @@ packages:
15
15
- yi-ireader
16
16
- yi-language
17
17
- yi-snippet
18
- # - yi
19
- extra-deps :
20
- - Hclip-3.0.0.4
21
- - yi-rope-0.10
22
- - dynamic-state-0.3
23
- # - gtk-0.14.6
24
- # - cairo-0.13.3.1
25
- # - gio-0.13.3.1
26
- # - glib-0.13.4.1
27
- # - gtk2hs-buildtools-0.13.2.2
28
- # - pango-0.13.3.1
18
+ - yi
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ packages:
5
5
- yi-core
6
6
- yi-dynamic-configuration
7
7
- yi-frontend-vty
8
- # - yi-frontend-pango
8
+ - yi-frontend-pango
9
9
- yi-fuzzy-open
10
10
- yi-keymap-cua
11
11
- yi-keymap-emacs
@@ -17,15 +17,15 @@ packages:
17
17
- yi-ireader
18
18
- yi-language
19
19
- yi-snippet
20
- # - yi
20
+ - yi
21
21
extra-deps :
22
22
- yi-rope-0.10
23
- resolver : lts-8.18
23
+ resolver : lts-9.8
24
24
build :
25
25
library-profiling : false
26
26
executable-profiling : false
27
27
28
28
# needed for macOS
29
29
# flags:
30
30
# gtk:
31
- # have-quartz-gtk: true
31
+ # have-quartz-gtk: true
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ executable yi
52
52
cpp-options : -DVTY
53
53
build-depends :
54
54
yi-frontend-vty >= 0.17
55
- if flag(pango)
55
+ if flag(pango) && impl(ghc < 8.2 )
56
56
cpp-options : -DPANGO
57
57
build-depends :
58
58
yi-frontend-pango >= 0.17
You can’t perform that action at this time.
0 commit comments