on master help sign in
update travis and appveyor config
commitd1cf131344b365995c83068668cf7e79d0a014a7 authorHarendra Kumar <harendra.kumar@gmail.com> dateTue 19 Dec 2017, 23:12 (9 years ago) parenta26f9dc
5 files changed+85−61
.travis.yml+79−48 appveyor.yml+2−2 stack-8.0.yaml+2−6 stack.yaml+1−3 streamly.cabal+1−2
.travis.yml+79−48
@@ -1,81 +1,96 @@
11notifications:
22 email: false
33
4−language: c
5−
6−sudo: false
7−cache:
8− directories:
9− - $HOME/.cabal
10− - $HOME/.ghc
11− - $HOME/.local
12− - $HOME/.stack
13−
144matrix:
155 include:
16− # cabal/linux
17− # cabal build for GHC 7.10.3 hangs
18− #- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22
19− #addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
206
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]}}
7+ # --------------------------------------------------------------------------
8+ # Linux/cabal builds
9+ # cabal builds require pre-installed cabal-install and ghc
10+ # --------------------------------------------------------------------------
2311
24− # stack/linux use a pre-installed cabal-install for faster builds
25− # GHC 8.0.1
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]}}
12+ # Note COVERALLS (hpc-coveralls) requires cabal build. Sends the coverage
13+ # info for the test suite named "test" to coveralls.io using hpc-coveralls.
14+ - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines --exclude-dir=test test"
15+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
2816
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]}}
17+ # --------------------------------------------------------------------------
18+ # Linux/stack builds
19+ # --------------------------------------------------------------------------
3120
32− # Note COVERALLS (hpc-coveralls) requires cabal build
33− - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 COVERALLS=y
34− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
21+ # GHC 7.10.3
22+ - env: BUILD=stack RESOLVER=lts-6.35 STACK_YAML=stack-7.10.yaml STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
23+ addons: {apt: {packages: [libgmp-dev,libsdl1.2-dev]}}
3524
36− #- env: BUILD=cabal GHCVER=head CABALVER=head
37− # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
25+ # GHC 8.0.2
26+ - env: BUILD=stack RESOLVER=lts-9.20 STACK_YAML=stack-8.0.yaml STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
27+ addons: {apt: {packages: [libsdl1.2-dev]}}
3828
39− - env: BUILD=stack RESOLVER=nightly CABALVER=2.0
40− addons: {apt: {packages: [libgmp-dev,cabal-install-2.0], sources: [hvr-ghc]}}
29+ # GHC 8.2.2
30+ - env: BUILD=stack RESOLVER=lts-10.0 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
31+ addons: {apt: {packages: [libsdl1.2-dev]}}
4132
42− #- env: BUILD=cabal GHCVER=head CABALVER=head
43− # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
33+ # Nightly
34+ - env: BUILD=stack RESOLVER=nightly
4435
45− # cabal/stack/osx - TODO install cabal-install
46− # GHC 8.0.1
47− - env: BUILD=cabal RESOLVER=lts-7.24
36+ # --------------------------------------------------------------------------
37+ # OS X builds
38+ # --------------------------------------------------------------------------
39+
40+ # GHC 8.2.2/cabal
41+ - env: BUILD=cabal RESOLVER=lts-10.0
4842 os: osx
4943
50− # GHC 8.0.2
51− - env: BUILD=stack RESOLVER=lts-9.16
44+ # GHC 8.2.2/stack
45+ - env: BUILD=stack RESOLVER=lts-10.0
5246 os: osx
5347
48+ # --------------------------------------------------------------------------
49+ # Lint
50+ # --------------------------------------------------------------------------
51+
52+ - env: BUILD=stack RESOLVER=lts-10.0 HLINT_OPTIONS="."
53+
54+ # --------------------------------------------------------------------------
55+ # Builds that are allowed to fail
56+ # --------------------------------------------------------------------------
57+
5458 allow_failures:
55− - env: BUILD=stack RESOLVER=nightly CABALVER=2.0
56− #- env: BUILD=cabal GHCVER=head CABALVER=head
59+ - env: BUILD=stack RESOLVER=nightly
60+ - env: BUILD=stack RESOLVER=lts-10.0 HLINT_OPTIONS="."
5761
58−install: true
5962script:
6063 - |
61− # Customizable options
62− PACKAGE_TEST_VER="7fe14f616d05d69de25a46002668a8509b6257a5"
64+ # ------------------------------------------------------------------------
65+ # You can customize these to desired values
66+ # ------------------------------------------------------------------------
67+
68+ # The commit id of the package-test script to use
69+ PACKAGE_TEST_VER="1a4de26422ee296f0811e032bec922123f019963"
6370 GHC_OPTIONS="-O0 -Werror"
64− test -n "$COVERALLS" && \
65− COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines \
66− --exclude-dir=test test"
6771
68− # Usually no changes should be needed after this
72+ # ------------------------------------------------------------------------
73+ # Normally no customizations should be needed this point onwards
74+ # ------------------------------------------------------------------------
75+
76+ # Where to find the package-test.sh script
77+ pkg_test() { echo https://raw.githubusercontent.com/harendra-kumar/package-test/$1/package-test.sh; }
78+
79+ # When GHCVER or CABALVER env variables are specified, modify the path to
80+ # find the binaries installed from hvr-ghc repo
6981 add_path() { eval "test -n \"\$$1\"" && eval "PATH=/opt/$2/\"\$$1\"/bin:$PATH"; true; }
82+
83+ # Emit the value of the var specified as arg only when the build is cabal
7084 cabal_env() { test "$BUILD" = cabal && echo $1; }
71− pkg_test() { echo https://raw.githubusercontent.com/harendra-kumar/package-test/$1/package-test.sh; }
7285
7386 CURL=$(which curl)
7487 PATH=/bin:/usr/bin
7588 add_path GHCVER ghc
7689 add_path CABALVER cabal
7790
78− # TRAVIS vars are needed by hpc-coveralls
91+ # We start with a clean environment (env -i) and specify all the
92+ # environment variables explicitly. TRAVIS vars are needed by
93+ # hpc-coveralls.
7994 - env -i
8095 LC_ALL=C.UTF-8
8196 TRAVIS=$TRAVIS
@@ -84,7 +99,7 @@ script:
8499 BUILD=$BUILD
85100 RESOLVER=$RESOLVER
86101 STACK_UPGRADE=y
87− STACK_YAML=$STACK_YAML
102+ STACK_YAML="$STACK_YAML"
88103 STACK_BUILD_OPTIONS="$STACK_BUILD_OPTIONS"
89104 GHCVER=$GHCVER
90105 GHC_OPTIONS="$GHC_OPTIONS"
@@ -95,4 +110,20 @@ script:
95110 $(cabal_env CABAL_CHECK_RELAX=y)
96111 $(cabal_env CABAL_NO_SANDBOX=y)
97112 $(cabal_env CABAL_HACKAGE_MIRROR=hackage.haskell.org:http://hackage.fpcomplete.com)
113+ HLINT_OPTIONS="$HLINT_OPTIONS"
98114 /bin/bash <($CURL -sL $(pkg_test $PACKAGE_TEST_VER))
115+
116+install: true
117+language: c
118+
119+# ------------------------------------------------------------------------
120+# Build caching
121+# ------------------------------------------------------------------------
122+
123+sudo: false
124+cache:
125+ directories:
126+ - $HOME/.cabal
127+ - $HOME/.ghc
128+ - $HOME/.local
129+ - $HOME/.stack
appveyor.yml+2−2
@@ -8,7 +8,7 @@ clone_folder: "c:\\pkg"
88environment:
99 global:
1010 BUILD: "stack"
11− RESOLVER: "lts-9.0"
11+ RESOLVER: "lts-10.0"
1212 GHC_OPTIONS: "-O0 -Werror"
1313 STACK_UPGRADE: "y"
1414# STACK_OPTIONS: "-v"
@@ -18,7 +18,7 @@ environment:
1818 PATH: "%PATH%;%APPDATA%\\local\\bin"
1919 CABAL_REINIT_CONFIG: "y"
2020 TEST_INSTALL: "y"
21− PACKAGE_TEST_VER: "7fe14f616d05d69de25a46002668a8509b6257a5"
21+ PACKAGE_TEST_VER: "1a4de26422ee296f0811e032bec922123f019963"
2222
2323cache:
2424 - "%STACK_ROOT%" # stack root
stack-8.0.yaml+2−6
@@ -1,17 +1,13 @@
1−resolver: lts-7.24
1+resolver: lts-9.20
22packages:
33- '.'
44extra-deps:
55 - lockfree-queue-0.2.3.1
66 - 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
127 - SDL-0.6.5.1
138flags: {}
149extra-package-dbs: []
10+rebuild-ghc-options: true
1511# For mac ports installed SDL library on Mac OS X
1612#extra-include-dirs:
1713#- /opt/local/include
stack.yaml+1−3
@@ -1,9 +1,7 @@
1−#resolver: lts-9.2
2−resolver: nightly-2017-09-07
1+resolver: lts-10.0
32packages:
43- '.'
54extra-deps:
6− - lockfree-queue-0.2.3.1
75 - simple-conduit-0.6.0
86 - SDL-0.6.5.1
97flags: {}
streamly.cabal+1−2
@@ -23,7 +23,7 @@ homepage: https://github.com/composewell/streamly
2323bug-reports: https://github.com/composewell/streamly/issues
2424license: BSD3
2525license-file: LICENSE
26−tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
26+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
2727author: Harendra Kumar
2828maintainer: harendra.kumar@gmail.com
2929copyright: 2017 Harendra Kumar
@@ -36,7 +36,6 @@ extra-source-files:
3636 Changelog.md
3737 README.md
3838 stack-7.10.yaml
39− stack-8.0.yaml
4039 stack.yaml
4140
4241source-repository head