Skip to content

Commit c20bdd6

Browse files
author
Jaro Reinders
committed
Move travis yaml files to separate folder and clean up
1 parent 94959ca commit c20bdd6

11 files changed

+60
-145
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ install:
3131
# install dependencies of yi-core separately to safe memory
3232
- stack test yi-core --no-terminal
3333
--install-ghc
34-
--stack-yaml $RESOLVER.yaml
34+
--stack-yaml travis/$RESOLVER.yaml
3535
--resolver $RESOLVER
3636
--only-dependencies
3737
- stack test --no-terminal
3838
--install-ghc
39-
--stack-yaml $RESOLVER.yaml
39+
--stack-yaml travis/$RESOLVER.yaml
4040
--resolver $RESOLVER
4141
--only-dependencies
4242

4343
script:
44-
- stack --no-terminal --stack-yaml $RESOLVER.yaml --resolver $RESOLVER test
44+
- stack --no-terminal --stack-yaml travis/$RESOLVER.yaml --resolver $RESOLVER test

all-configs.yaml

-38
This file was deleted.

lts-6.yaml

-23
This file was deleted.

lts-7.yaml

-22
This file was deleted.

lts-9.yaml

-20
This file was deleted.

maintainer/upload.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ main = do
1515
callProcess "stack" ["sdist", p]
1616

1717
forM_ packages $ \p ->
18-
when (p `notElem` ["yi", "yi-intero"]) $ catch
18+
when (p `notElem` ["yi-intero"]) $ catch
1919
(callProcess "stack" ["upload", "--no-signature", p])
20-
(\e -> let _ = e :: SomeException in pure ())
20+
(\e -> let _ = e :: SomeException in pure ())

nightly.yaml

-18
This file was deleted.

stack-ghc-8.2.yaml

-18
This file was deleted.

travis/lts-9.yaml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
- ../example-configs/yi-all-static
19+
- ../example-configs/yi-emacs-vty-static
20+
- ../example-configs/yi-emacs-vty-dynamic
21+
- ../example-configs/yi-vim-colemak-vty-dynamic
22+
- ../example-configs/yi-vim-pango-dynamic
23+
- ../example-configs/yi-vim-pango-static
24+
- ../example-configs/yi-vim-vty-dynamic
25+
- ../example-configs/yi-vim-vty-static
26+
extra-deps:
27+
- yi-rope-0.10
28+
resolver: lts-9.8

travis/nightly.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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
19+
# - ../example-configs/yi-all-static
20+
- ../example-configs/yi-emacs-vty-static
21+
- ../example-configs/yi-emacs-vty-dynamic
22+
- ../example-configs/yi-vim-colemak-vty-dynamic
23+
# - ../example-configs/yi-vim-pango-dynamic
24+
# - ../example-configs/yi-vim-pango-static
25+
- ../example-configs/yi-vim-vty-dynamic
26+
- ../example-configs/yi-vim-vty-static

yi/yi.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ flag emacs
1919
default: True
2020

2121
flag pango
22-
description: Include the pango (GUI) frontend
22+
description: Include the pango (GUI) frontend, this flag is ignored if compiling with ghc >= 8.2
2323
manual: True
2424
default: True
2525

0 commit comments

Comments
 (0)