on master help sign in
Merge branch 'master' into dev
commitcbbbf513c2e4c8c56e877ee1e737ee87fe77ed0f authorEvan Czaplicki <info@elm-lang.org> dateMon 21 Sep 2015, 18:40 (11 years ago) parent858394d5aeae62
3 files changed+13−20
.travis.yml+11−20 src/Elm/Utils.hs+1 src/Type/State.hs+1
.travis.yml+11−20
@@ -1,27 +1,18 @@
1−# Based on https://github.com/hvr/multi-ghc-travis and https://github.com/ekmett/lens/blob/master/.travis.yml
1+sudo: false
22
3−# NB: don't set `language: haskell` here
3+addons:
4+ apt:
5+ sources:
6+ - hvr-ghc
7+ packages:
8+ - ghc-7.10.1
9+ - cabal-install-1.22
10+ - happy
11+ - alex
412
5−# The following enables several GHC versions to be tested; often it's enough
6−# to test only against the last release in a major GHC version. Feel free to
7−# omit lines listings versions you don't need/want testing for.
8−env:
9− - CABALVER=1.22 GHCVER=7.10.1
1013
11−
12−# Note: the distinction between `before_install` and `install` is not important.
1314before_install:
14− - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
15− - travis_retry sudo apt-get update
16− - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER # see note about happy/alex
17− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
18− - |
19− if [ ${GHCVER%.*} = "7.8" ] || [ ${GHCVER%.*} = "7.10" ]; then
20− travis_retry sudo apt-get install happy-1.19.4 alex-3.1.3
21− export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH
22− else
23− travis_retry sudo apt-get install happy alex
24− fi
15+- export PATH=/opt/ghc/7.10.1/bin:/opt/cabal/1.22/bin:$PATH
2516
2617
2718install:
src/Elm/Utils.hs+1
@@ -1,5 +1,6 @@
11{-# OPTIONS_GHC -Wall #-}
22{-# LANGUAGE FlexibleContexts #-}
3+{-# LANGUAGE MultiParamTypeClasses #-}
34module Elm.Utils
45 ( (|>), (<|)
56 , getAsset
src/Type/State.hs+1
@@ -1,4 +1,5 @@
11{-# LANGUAGE FlexibleContexts #-}
2+{-# LANGUAGE MultiParamTypeClasses #-}
23module Type.State where
34
45import Control.Applicative ( Applicative, (<$>), (<*>), (<|>) )