@@ -79,19 +79,19 @@ matrix:
7979
8080 # For 7.10.3 we disable -Werror because of some bogus SPECIALIZE pragma
8181 # warnings.
82− #- env: BUILD=stack RESOLVER=lts-6 GHCVER=7.10.3 GHC_OPTIONS="" STACK_YAML=stack-7.10.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
83− # addons: {apt: {packages: [cabal-install-1.22,libsdl1.2-dev], sources: [hvr-ghc]}}
82+ - env: BUILD=stack RESOLVER=lts-6 GHCVER=7.10.3 GHC_OPTIONS="" STACK_YAML=stack-7.10.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
83+ addons: {apt: {packages: [cabal-install-1.22,libsdl1.2-dev], sources: [hvr-ghc]}}
8484
85− #- env: BUILD=stack RESOLVER=lts-9 GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
86− # addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}
85+ - env: BUILD=stack RESOLVER=lts-9 GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
86+ addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}
8787
88− ## Use cabal-install-1.24 for stack solver to work
89− #- env: BUILD=stack GHCVER=8.2.2 RESOLVER=lts-11 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:diag"
90− # addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}
88+ # Use cabal-install-1.24 for stack solver to work
89+ - env: BUILD=stack GHCVER=8.2.2 RESOLVER=lts-11 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:diag"
90+ addons: {apt: {packages: [cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}
9191
92− ## Use cabal-install-1.24 for stack solver to work
93− #- env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y
94− # addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}
92+ # Use cabal-install-1.24 for stack solver to work
93+ - env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y
94+ addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}
9595
9696 # You can keep a STACK_YAML file at any path location
9797 #- env: BUILD=stack STACK_YAML=.ci/stack-8.0.yaml
@@ -116,14 +116,14 @@ matrix:
116116
117117 # Using stack builds, cabal builds get terminated because the tests
118118 # take more than 10 minutes and it does not produce any output until the end.
119− #- env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3
120− # addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
119+ - env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3
120+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
121121
122− #- env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3 GHC_OPTIONS="" STACK_BUILD_OPTIONS="--flag streamly:streamk"
123− # addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
122+ - env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4.3 GHC_OPTIONS="" STACK_BUILD_OPTIONS="--flag streamly:streamk"
123+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
124124
125− #- env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""
126− # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
125+ - env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""
126+ addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
127127
128128 # You can specify build flags like this:
129129 #- env: BUILD=cabal-new CABAL_NEWBUILD_OPTIONS="--flags=dev"
@@ -134,8 +134,8 @@ matrix:
134134 # --------------------------------------------------------------------------
135135
136136 # GHC 8.2.2/cabal build using stack!
137− #- env: BUILD=cabal-new RESOLVER=lts-11 GHCVER=8.2.2 GHC_OPTIONS=""
138− # os: osx
137+ - env: BUILD=cabal-new RESOLVER=lts-11 GHCVER=8.2.2 GHC_OPTIONS=""
138+ os: osx
139139
140140 # GHC 8.2.2/stack
141141 #- env: BUILD=stack RESOLVER=lts-11 GHCVER=8.2.2
@@ -145,7 +145,7 @@ matrix:
145145 # Lint e.g. HLINT_COMMANDS="hlint lint src; hlint lint test"
146146 # --------------------------------------------------------------------------
147147
148− #- env: BUILD=stack RESOLVER=lts-11 HLINT_COMMANDS="hlint lint ."
148+ - env: BUILD=stack RESOLVER=lts-11 HLINT_COMMANDS="hlint lint ."
149149
150150 # --------------------------------------------------------------------------
151151 # Build and send coverage report to coveralls.io using hpc-coveralls
@@ -153,8 +153,8 @@ matrix:
153153 # For available options see hpc-coveralls docs.
154154 # --------------------------------------------------------------------------
155155
156− - env: BUILD=cabal COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines --exclude-dir=test test properties loops nested-loops parallel-loops" GHC_OPTIONS="-DCOVERAGE_BUILD" DISABLE_SDIST_BUILD=y DISABLE_BENCH=y DISABLE_DOCS=y
157− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
156+ #- env: BUILD=cabal COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines --exclude-dir=test test properties loops nested-loops parallel-loops" GHC_OPTIONS="-DCOVERAGE_BUILD" DISABLE_SDIST_BUILD=y DISABLE_BENCH=y DISABLE_DOCS=y
157+ # addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
158158
159159 # --------------------------------------------------------------------------
160160 # Builds that are allowed to fail