Skip to content

Commit 9e695c0

Browse files
Update github CI, move common options at one place
1 parent 954e0b3 commit 9e695c0

4 files changed

Lines changed: 23 additions & 43 deletions

File tree

.github/workflows/haskell.yml

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ jobs:
9393
BUILD_PREFETCH=y
9494
GHCUP_VERSION=latest
9595
GHCVER=${{ matrix.ghc_version }}
96+
DISABLE_SDIST_BUILD="y"
97+
DISABLE_BENCH="y"
98+
DISABLE_DOCS="y"
9699
97100
# WARNING! you cannot use comments in this
98101
CABAL_OPTIONS: >-
@@ -109,7 +112,7 @@ jobs:
109112
# If you have not committed packcheck.sh in your repo at PACKCHECK
110113
# then it is automatically pulled from this URL.
111114
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
112-
PACKCHECK_GITHUB_COMMIT: "669c3b553add086bb8a667049ac21cf83499cf13"
115+
PACKCHECK_GITHUB_COMMIT: "b3743510c7c26f83254ffd9ef91bcd71560cff05"
113116

114117
# Pull token from "secrets" setting of the github repo
115118
#COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
@@ -169,17 +172,17 @@ jobs:
169172
# DISABLE_SDIST_BUILD="y"
170173
# ignore_error: true
171174

172-
- name: fusion
175+
# Disable sdist build so that we can test all packages.
176+
- name: fusion-bench-doc
173177
runner: ubuntu-latest
174178
command: cabal
175179
ghc_version: 9.14.1
176180
# WARNING! cannot use # comments inside pack_options.
177181
pack_options: >-
178182
CABAL_PROJECT=cabal.project
179183
CABAL_BUILD_OPTIONS="--flag limit-build-mem --flag fusion-plugin"
180-
DISABLE_SDIST_BUILD="y"
181-
DISABLE_DOCS="y"
182-
DISABLE_BENCH="y"
184+
DISABLE_DOCS="n"
185+
DISABLE_BENCH="n"
183186
ignore_error: false
184187

185188
- name: streamly-core-sdist
@@ -189,21 +192,18 @@ jobs:
189192
subdir: core
190193
ignore_error: false
191194

192-
- name: debug-unoptimized
195+
- name: debug-no-opt
193196
runner: macos-latest
194197
command: cabal
195198
ghc_version: 9.14.1
196199
# WARNING! cannot use # comments inside pack_options.
197200
pack_options: >-
198201
CABAL_PROJECT=cabal.project
199202
CABAL_BUILD_OPTIONS="--flag debug --flag -opt"
200-
DISABLE_SDIST_BUILD="y"
201-
DISABLE_DOCS="y"
202-
DISABLE_BENCH="y"
203203
ignore_error: false
204204

205205
# Takes too long, so bench is disabled
206-
- name: ghc-9.12.4
206+
- name: nightly-2026-03-10
207207
runner: macos-latest
208208
command: stack
209209
# WARNING! cannot use # comments inside pack_options.
@@ -212,11 +212,8 @@ jobs:
212212
STACK_UPGRADE="y"
213213
RESOLVER=nightly-2026-03-10
214214
STACK_YAML=stack.yaml
215-
DISABLE_SDIST_BUILD="y"
216215
SDIST_OPTIONS="--ignore-check"
217216
DISABLE_DIST_CHECKS="y"
218-
DISABLE_DOCS="y"
219-
DISABLE_BENCH="y"
220217
ignore_error: false
221218

222219
# Note: use linux for warning build for convenient dev testing
@@ -240,8 +237,6 @@ jobs:
240237
pack_options: >-
241238
CABAL_PROJECT=cabal.project
242239
CABAL_BUILD_OPTIONS="--flag fusion-plugin --flag inspection"
243-
DISABLE_SDIST_BUILD="y"
244-
DISABLE_DOCS="y"
245240
ignore_error: false
246241

247242
- name: ci
@@ -251,9 +246,6 @@ jobs:
251246
# WARNING! cannot use # comments inside pack_options.
252247
pack_options: >-
253248
CABAL_PROJECT=cabal.project
254-
DISABLE_SDIST_BUILD="y"
255-
DISABLE_DOCS="y"
256-
DISABLE_BENCH="y"
257249
ignore_error: false
258250

259251
- name: streamly-sdist
@@ -263,6 +255,7 @@ jobs:
263255
# WARNING! cannot use # comments inside pack_options.
264256
pack_options: >-
265257
CABAL_PROJECT=cabal.project.streamly
258+
DISABLE_SDIST_BUILD="n"
266259
ignore_error: true
267260

268261
- name: lstat-readdir
@@ -273,12 +266,9 @@ jobs:
273266
pack_options: >-
274267
CABAL_PROJECT=cabal.project
275268
CABAL_BUILD_OPTIONS="--flag force-lstat-readdir"
276-
DISABLE_SDIST_BUILD="y"
277-
DISABLE_DOCS="y"
278-
DISABLE_BENCH="y"
279269
ignore_error: false
280270

281-
- name: ci
271+
- name: custom-ghc
282272
runner: ubuntu-latest
283273
command: cabal
284274
ghc_version: 9.2.8
@@ -288,9 +278,6 @@ jobs:
288278
pack_options: >-
289279
GHCUP_GHC_OPTIONS="-u https://github.com/composewell/ghc/releases/download/ghc-9.2.8-perf-counters-1-rc1/ghc-9.2.8.20231130-x86_64-unknown-linux.tar.xz"
290280
CABAL_PROJECT=cabal.project
291-
DISABLE_SDIST_BUILD="y"
292-
DISABLE_DOCS="y"
293-
DISABLE_BENCH="y"
294281
ignore_error: false
295282

296283
- name: unoptimized
@@ -300,10 +287,6 @@ jobs:
300287
# WARNING! cannot use # comments inside pack_options.
301288
pack_options: >-
302289
CABAL_PROJECT=cabal.project
303-
DISABLE_SDIST_BUILD="y"
304-
DISABLE_DOCS="y"
305-
DISABLE_BENCH="y"
306-
DISABLE_DIST_CHECKS="y"
307290
CABAL_BUILD_OPTIONS="--flags \"-opt\""
308291
ignore_error: false
309292

@@ -314,8 +297,6 @@ jobs:
314297
# WARNING! cannot use # comments inside pack_options.
315298
pack_options: >-
316299
CABAL_PROJECT=cabal.project
317-
CABAL_BUILD_OPTIONS="--flag limit-build-mem"
318-
DISABLE_SDIST_BUILD="y"
319300
ignore_error: false
320301

321302
#- name: ci

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ packages: streamly.cabal
55
, bench-test-lib/bench-test-lib.cabal
66

77
-- For debugging heap overflow
8-
jobs: 1
8+
-- jobs: 1
99

1010
source-repository-package
1111
type: git

cabal.project.Werror

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ packages:
66
bench-test-lib
77

88
-- For debugging heap overflow
9-
jobs: 1
9+
-- jobs: 1
1010

1111
package streamly
1212
ghc-options: -Werror

streamly.cabal

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,15 @@ homepage: https://streamly.composewell.com
4545
bug-reports: https://github.com/composewell/streamly/issues
4646
license: BSD-3-Clause
4747
license-file: LICENSE
48-
tested-with: GHC==8.6.5
49-
, GHC==8.8.4
50-
, GHC==8.10.7
51-
, GHC==9.0.2
52-
, GHC==9.2.8
53-
, GHC==9.4.7
54-
, GHC==9.6.3
55-
, GHC==9.8.1
56-
, GHC==9.10.1
57-
, GHC==9.12.1
48+
tested-with:
49+
GHC==8.10.7
50+
, GHC==9.2.8
51+
, GHC==9.4.7
52+
, GHC==9.6.3
53+
, GHC==9.8.4
54+
, GHC==9.10.3
55+
, GHC==9.12.4
56+
, GHC==9.14.1
5857
author: Composewell Technologies
5958
maintainer: streamly@composewell.com
6059
copyright: 2017 Composewell Technologies

0 commit comments

Comments
 (0)