e4ed109 · streamly · git.iko.soy

git.iko.soy/streamly

Travis build with examples-sdl

commite4ed10948843e4eb41a0239434ec08d677b67893 authorHarendra Kumar <harendra.kumar@gmail.com> dateMon 4 Dec 2017, 16:09 (9 years ago) parent74c3785

7 files changed+62−16

compare with master

unifiedsplit

.travis.yml+11−6 appveyor.yml+1−1 src/Streamly/Examples/AcidRainGame.hs+1−1 src/Streamly/Examples/MergeSortedStreams.hs+1−1 stack-7.10.yaml+16 stack-8.0.yaml+17 streamly.cabal+15−7

.travis.yml+11−6

@@ -18,13 +18,16 @@ matrix:

1818 #- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22

1919 #addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

2020

21− - env: BUILD=stack RESOLVER=lts-6.35 CABALVER=1.22

22− addons: {apt: {packages: [libgmp-dev,cabal-install-1.22], sources: [hvr-ghc]}}

21+ - env: BUILD=stack RESOLVER=lts-6.35 STACK_YAML=stack-7.10.yaml STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" CABALVER=1.22

22+ addons: {apt: {packages: [libgmp-dev,cabal-install-1.22,libsdl1.2-dev], sources: [hvr-ghc]}}

2323

2424 # stack/linux use a pre-installed cabal-install for faster builds

2525 # GHC 8.0.1

26− - env: BUILD=stack RESOLVER=lts-7.24 CABALVER=1.24

27− addons: {apt: {packages: [libgmp-dev,cabal-install-1.24], sources: [hvr-ghc]}}

26+ - env: BUILD=stack RESOLVER=lts-7.24 STACK_YAML=stack-8.0.yaml STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" CABALVER=1.24

27+ addons: {apt: {packages: [libgmp-dev,cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}

28+

29+ - env: BUILD=stack RESOLVER=lts-9.16 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" CABALVER=1.24

30+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,libsdl1.2-dev], sources: [hvr-ghc]}}

2831

2932 # Note COVERALLS (hpc-coveralls) requires cabal build

3033 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 COVERALLS=y

@@ -45,7 +48,7 @@ matrix:

4548 os: osx

4649

4750 # GHC 8.0.2

48− - env: BUILD=stack RESOLVER=lts-9.3

51+ - env: BUILD=stack RESOLVER=lts-9.16

4952 os: osx

5053

5154 allow_failures:

@@ -56,7 +59,7 @@ install: true

5659script:

5760 - |

5861 # Customizable options

59− PACKAGE_TEST_VER="536355be0507c234e5b4ea51dafdb8c3d1ede948"

62+ PACKAGE_TEST_VER="df401952254b782379b3d109bd051a4a56e61635"

6063 GHC_OPTIONS="-O0 -Werror"

6164 test -n "$COVERALLS" && \

6265 COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines \

@@ -80,6 +83,8 @@ script:

8083 PATH=$PATH

8184 BUILD=$BUILD

8285 RESOLVER=$RESOLVER

86+ STACK_YAML=$STACK_YAML

87+ STACK_BUILD_OPTIONS="$STACK_BUILD_OPTIONS"

8388 GHCVER=$GHCVER

8489 GHC_OPTIONS="$GHC_OPTIONS"

8590 COVERALLS_OPTIONS="$COVERALLS_OPTIONS"

appveyor.yml+1−1

@@ -17,7 +17,7 @@ environment:

1717 PATH: "%PATH%;%APPDATA%\\local\\bin"

1818 CABAL_REINIT_CONFIG: "y"

1919 TEST_INSTALL: "y"

20− PACKAGE_TEST_VER: "536355be0507c234e5b4ea51dafdb8c3d1ede948"

20+ PACKAGE_TEST_VER: "df401952254b782379b3d109bd051a4a56e61635"

2121

2222cache:

2323 - "%STACK_ROOT%" # stack root

src/Streamly/Examples/AcidRainGame.hs+1−1

@@ -8,7 +8,7 @@ module Streamly.Examples.AcidRainGame where

88import Streamly

99import Control.Concurrent (threadDelay)

1010import Control.Monad (when)

11−import Control.Monad.State

11+import Control.Monad.State (MonadState, get, modify, runStateT)

1212import Data.Semigroup (cycle1)

1313

1414data Event = Harm Int | Heal Int | Quit deriving (Show)

src/Streamly/Examples/MergeSortedStreams.hs+1−1

@@ -3,7 +3,7 @@

33module Streamly.Examples.MergeSortedStreams where

55import Data.Word

6−import System.Random

6+import System.Random (getStdGen, randoms)

77import Data.List (sort)

88import Streamly

99import qualified Streamly.Prelude as A

stack-7.10.yamlnew file+16

@@ -0,0 +1,16 @@

1+resolver: lts-6.35

2+packages:

3+- '.'

4+extra-deps:

5+ - lockfree-queue-0.2.3.1

6+ - simple-conduit-0.4.0

7+ - transient-0.5.9.2

8+ - http-conduit-2.2.2

9+ - http-client-0.5.0

10+ - http-client-tls-0.3.0

11+ - SDL-0.6.5.1

12+flags: {}

13+extra-package-dbs: []

14+# For mac ports installed SDL library on Mac OS X

15+#extra-include-dirs:

16+#- /opt/local/include

stack-8.0.yamlnew file+17

@@ -0,0 +1,17 @@

1+resolver: lts-7.24

2+packages:

3+- '.'

4+extra-deps:

5+ - lockfree-queue-0.2.3.1

6+ - simple-conduit-0.6.0

7+ - transient-0.4.4

8+ - monad-recorder-0.1.0

9+ - http-conduit-2.2.2

10+ - http-client-0.5.0

11+ - http-client-tls-0.3.0

12+ - SDL-0.6.5.1

13+flags: {}

14+extra-package-dbs: []

15+# For mac ports installed SDL library on Mac OS X

16+#extra-include-dirs:

17+#- /opt/local/include

streamly.cabal+15−7

@@ -23,6 +23,7 @@ homepage: http://github.com/harendra-kumar/streamly

2323bug-reports: https://github.com/harendra-kumar/streamly/issues

2424license: BSD3

2525license-file: LICENSE

26+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1

2627author: Harendra Kumar

2728maintainer: harendra.kumar@gmail.com

2829copyright: 2017 Harendra Kumar

@@ -31,6 +32,13 @@ stability: Experimental

3132build-type: Simple

3233cabal-version: >= 1.10

3334

35+extra-source-files:

36+ Changelog.md

37+ README.md

38+ stack-7.10.yaml

39+ stack-8.0.yaml

40+ stack.yaml

41+

3442source-repository head

3543 type: git

3644 location: https://github.com/harendra-kumar/streamly

@@ -112,9 +120,9 @@ library

112120

113121 if flag(examples) || flag(examples-sdl)

114122 build-Depends:

115− http-conduit

116− , path-io

117− , random

123+ http-conduit >= 2.2.2 && < 2.3

124+ , path-io >= 0.1.0 && < 1.4

125+ , random >= 1.0.0 && < 1.2

118126

119127 if flag(examples-sdl)

120128 build-Depends:

@@ -208,8 +216,8 @@ executable nested-loops

208216 buildable: True

209217 build-Depends:

210218 streamly

211− , base >= 4.8 && < 5

212− , random

219+ , base >= 4.8 && < 5

220+ , random >= 1.0.0 && < 1.2

213221 else

214222 buildable: False

215223

@@ -220,7 +228,7 @@ executable parallel-loops

220228 buildable: True

221229 build-Depends:

222230 streamly

223− , base >= 4.8 && < 5

224− , random

231+ , base >= 4.8 && < 5

232+ , random >= 1.0.0 && < 1.2

225233 else

226234 buildable: False