Merge pull request #1056 from noughtmare/travis-testing

Allow yi to build with ghc-8.2 (without pango)

Author: noughtmare

.travis.yml

@@ -11,8 +11,12 @@ cache:
 
 matrix:
   include:
-  - env: RESOLVER="lts-8"
   - env: RESOLVER="lts-9"
+    addons:
+      apt:
+        packages:
+        - libpango1.0-dev
+        - libgtk2.0-dev
   - env: RESOLVER="nightly"
   allow_failures:
   - env: RESOLVER="nightly"
@@ -25,8 +29,16 @@ before_install:
 
 install:
 # install dependencies of yi-core separately to safe memory
-- stack --no-terminal --install-ghc --resolver $RESOLVER test yi-core --only-dependencies
-- stack --no-terminal --install-ghc --resolver $RESOLVER test --only-dependencies
+- stack test yi-core --no-terminal
+                     --install-ghc
+                     --stack-yaml travis/$RESOLVER.yaml
+                     --resolver $RESOLVER
+                     --only-dependencies
+- stack test --no-terminal
+             --install-ghc
+             --stack-yaml travis/$RESOLVER.yaml
+             --resolver $RESOLVER
+             --only-dependencies
 
 script:
-- stack --no-terminal --resolver $RESOLVER test
+- stack --no-terminal --stack-yaml travis/$RESOLVER.yaml --resolver $RESOLVER test

all-configs.yaml

@@ -8,7 +8,7 @@ cabal-version:       >=1.10
 
 executable yi
   main-is:             Main.hs
-  build-depends:       base >=4.8 && <4.10
+  build-depends:       base >=4.8 && <5
                      , yi-core >= 0.17
                      , yi-dynamic-configuration >= 0.17
                      , yi-keymap-emacs >= 0.17

example-configs/yi-emacs-vty-dynamic/yi-emacs-vty-dynamic.cabal

@@ -8,7 +8,7 @@ cabal-version:       >=1.10
 
 executable yi
   main-is:             Main.hs
-  build-depends:       base >=4.8 && <4.10
+  build-depends:       base >=4.8 && <5
                      , yi-core >= 0.17
                      , yi-dynamic-configuration >= 0.17
                      , yi-keymap-vim >= 0.17

example-configs/yi-vim-colemak-vty-dynamic/yi-vim-colemak-vty-dynamic.cabal

@@ -8,7 +8,7 @@ cabal-version:       >=1.10
 
 executable yi
   main-is:             Main.hs
-  build-depends:       base >=4.8 && <4.10
+  build-depends:       base >=4.8 && <5
                      , yi-core >= 0.17
                      , yi-dynamic-configuration >= 0.17
                      , yi-keymap-vim >= 0.17

example-configs/yi-vim-pango-dynamic/yi-vim-pango-dynamic.cabal

@@ -8,7 +8,7 @@ cabal-version:       >=1.10
 
 executable yi
   main-is:             yi.hs
-  build-depends:       base >=4.8 && <4.10
+  build-depends:       base >=4.8 && <5
                      , yi-core >= 0.17
                      , yi-dynamic-configuration >= 0.17
                      , yi-keymap-vim >= 0.17

example-configs/yi-vim-vty-dynamic/yi-vim-vty-dynamic.cabal

@@ -15,6 +15,6 @@ main = do
         callProcess "stack" ["sdist", p]
 
     forM_ packages $ \p ->
-        when (p `notElem` ["yi", "yi-intero"]) $ catch
+        when (p `notElem` ["yi-intero"]) $ catch
             (callProcess "stack" ["upload", "--no-signature", p])
-            (\e -> let _ = e :: SomeException in pure ())
+            (\e -> let _ = e :: SomeException in pure ())

lts-6.yaml

@@ -5,7 +5,7 @@ packages:
 - yi-core
 - yi-dynamic-configuration
 - yi-frontend-vty
-# - yi-frontend-pango
+- yi-frontend-pango
 - yi-fuzzy-open
 - yi-keymap-cua
 - yi-keymap-emacs
@@ -17,15 +17,15 @@ packages:
 - yi-ireader
 - yi-language
 - yi-snippet
-# - yi
+- yi
 extra-deps:
 - yi-rope-0.10
-resolver: lts-8.18
+resolver: lts-9.8
 build:
  library-profiling: false
  executable-profiling: false
 
 # needed for macOS
 # flags:
 #   gtk:
-#     have-quartz-gtk: true
+#     have-quartz-gtk: true

lts-7.yaml

@@ -0,0 +1,28 @@
+packages:
+- ../yi-core
+- ../yi-dynamic-configuration
+- ../yi-frontend-vty
+- ../yi-frontend-pango
+- ../yi-fuzzy-open
+- ../yi-keymap-cua
+- ../yi-keymap-emacs
+- ../yi-keymap-vim
+- ../yi-mode-haskell
+- ../yi-mode-javascript
+- ../yi-misc-modes
+- ../yi-intero
+- ../yi-ireader
+- ../yi-language
+- ../yi-snippet
+- ../yi
+- ../example-configs/yi-all-static
+- ../example-configs/yi-emacs-vty-static
+- ../example-configs/yi-emacs-vty-dynamic
+- ../example-configs/yi-vim-colemak-vty-dynamic
+- ../example-configs/yi-vim-pango-dynamic
+- ../example-configs/yi-vim-pango-static
+- ../example-configs/yi-vim-vty-dynamic
+- ../example-configs/yi-vim-vty-static
+extra-deps:
+- yi-rope-0.10
+resolver: lts-9.8

maintainer/upload.hs

@@ -0,0 +1,26 @@
+resolver: nightly-2017-10-11
+
+packages:
+- ../yi-core
+- ../yi-dynamic-configuration
+- ../yi-frontend-vty
+# - ../yi-frontend-pango
+- ../yi-fuzzy-open
+- ../yi-keymap-cua
+- ../yi-keymap-emacs
+- ../yi-keymap-vim
+- ../yi-mode-haskell
+- ../yi-mode-javascript
+- ../yi-misc-modes
+- ../yi-ireader
+- ../yi-language
+- ../yi-snippet
+- ../yi
+# - ../example-configs/yi-all-static
+- ../example-configs/yi-emacs-vty-static
+- ../example-configs/yi-emacs-vty-dynamic
+- ../example-configs/yi-vim-colemak-vty-dynamic
+# - ../example-configs/yi-vim-pango-dynamic
+# - ../example-configs/yi-vim-pango-static
+- ../example-configs/yi-vim-vty-dynamic
+- ../example-configs/yi-vim-vty-static

stack-ghc-8.2.yaml

@@ -19,7 +19,7 @@ flag emacs
   default: True
 
 flag pango
-  description: Include the pango (GUI) frontend
+  description: Include the pango (GUI) frontend, this flag is ignored if compiling with ghc >= 8.2
   manual: True
   default: True
 
@@ -52,7 +52,7 @@ executable yi
     cpp-options: -DVTY
     build-depends:
         yi-frontend-vty >= 0.17
-  if flag(pango)
+  if flag(pango) && impl(ghc < 8.2)
     cpp-options: -DPANGO
     build-depends:
         yi-frontend-pango >= 0.17