Skip to content

Commit 22515ce

Browse files
harendra-kumarharendra-kumar
committed
Disable benchmark build in most CIs to reduce time
1 parent 397ce94 commit 22515ce

4 files changed

Lines changed: 51 additions & 34 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ env: &env
5757
# If you have not committed packcheck.sh in your repo at PACKCHECK
5858
# then it is automatically pulled from this URL.
5959
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
60-
PACKCHECK_GITHUB_COMMIT: "fac7ab9aad48d5b80a1d65efb34ff353a848e927"
60+
PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
6161

6262
executors:
6363
amd64-executor:

‎.cirrus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ task:
5656
# If you have not committed packcheck.sh in your repo at PACKCHECK
5757
# then it is automatically pulled from this URL.
5858
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
59-
PACKCHECK_GITHUB_COMMIT: "9dd1ef534075f9628593d627f76085a84b304597"
59+
PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
6060

6161
cabal_cache:
6262
folder: ~/.cabal

‎.github/workflows/haskell.yml‎

Lines changed: 48 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
# If you have not committed packcheck.sh in your repo at PACKCHECK
8585
# then it is automatically pulled from this URL.
8686
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
87-
PACKCHECK_GITHUB_COMMIT: "8a8e818e51dbadb96628d723eaa42a4e95df9106"
87+
PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
8888

8989
# ------------------------------------------------------------------------
9090
# Final build variables
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ${{ matrix.runner }}
103103
continue-on-error: ${{ matrix.ignore_error }}
104104
strategy:
105-
fail-fast: true
105+
fail-fast: false
106106
matrix:
107107

108108
# The order of jobs is important to optimize fail-fast.
@@ -129,26 +129,26 @@ jobs:
129129
# it.
130130
include:
131131

132-
- name: ci
133-
runner: ubuntu-latest
134-
command: cabal
135-
ghc_version: head
136-
# The URL may change, to find a working URL go to https://gitlab.haskell.org/ghc/ghc/-/jobs/
137-
# Find a debian10/11/12 job, click on a passed/failed status, at the
138-
# end of the output you will find the tar.xz name, put that tar
139-
# name after "raw/", and put the job name after "job=".
140-
# Also see https://github.com/mpickering/ghc-artefact-nix/blob/master/gitlab-artifact.nix
141-
#
142-
# May also use ghcup for installing ghc head version, use the
143-
# version "LatestNightly", and the following config:
144-
# ghcup config add-release-channel https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml
145-
# WARNING! cannot use # comments inside pack_options.
146-
pack_options: >-
147-
GHCUP_GHC_OPTIONS="-u https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-deb10-int_native-validate.tar.xz?job=x86_64-linux-deb10-int_native-validate"
148-
CABAL_PROJECT=cabal.project.ghc-head
149-
CABAL_BUILD_OPTIONS="--flag limit-build-mem"
150-
DISABLE_SDIST_BUILD="y"
151-
ignore_error: true
132+
#- name: ci
133+
# runner: ubuntu-latest
134+
# command: cabal
135+
# ghc_version: head
136+
# # The URL may change, to find a working URL go to https://gitlab.haskell.org/ghc/ghc/-/jobs/
137+
# # Find a debian10/11/12 job, click on a passed/failed status, at the
138+
# # end of the output you will find the tar.xz name, put that tar
139+
# # name after "raw/", and put the job name after "job=".
140+
# # Also see https://github.com/mpickering/ghc-artefact-nix/blob/master/gitlab-artifact.nix
141+
# #
142+
# # May also use ghcup for installing ghc head version, use the
143+
# # version "LatestNightly", and the following config:
144+
# # ghcup config add-release-channel https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml
145+
# # WARNING! cannot use # comments inside pack_options.
146+
# pack_options: >-
147+
# GHCUP_GHC_OPTIONS="-u https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-deb10-int_native-validate.tar.xz?job=x86_64-linux-deb10-int_native-validate"
148+
# CABAL_PROJECT=cabal.project.ghc-head
149+
# CABAL_BUILD_OPTIONS="--flag limit-build-mem"
150+
# DISABLE_SDIST_BUILD="y"
151+
# ignore_error: true
152152

153153
- name: streamly-core-sdist
154154
runner: ubuntu-latest
@@ -167,6 +167,7 @@ jobs:
167167
CABAL_BUILD_OPTIONS="--flag debug --flag -opt"
168168
DISABLE_SDIST_BUILD="y"
169169
DISABLE_DOCS="y"
170+
DISABLE_BENCH="y"
170171
ignore_error: false
171172

172173
# Takes too long, so bench is disabled
@@ -195,6 +196,8 @@ jobs:
195196
CABAL_PROJECT=cabal.project
196197
CABAL_BUILD_OPTIONS="--flag limit-build-mem --flag fusion-plugin"
197198
DISABLE_SDIST_BUILD="y"
199+
DISABLE_DOCS="y"
200+
DISABLE_BENCH="y"
198201
ignore_error: false
199202

200203
# Note: use linux for warning build for convenient dev testing
@@ -207,6 +210,7 @@ jobs:
207210
CABAL_PROJECT=cabal.project.Werror
208211
CABAL_BUILD_OPTIONS="--flag limit-build-mem"
209212
DISABLE_SDIST_BUILD="y"
213+
DISABLE_BENCH="y"
210214
ignore_error: false
211215

212216
- name: fusion-inspection
@@ -218,17 +222,19 @@ jobs:
218222
CABAL_PROJECT=cabal.project
219223
CABAL_BUILD_OPTIONS="--flag fusion-plugin --flag inspection"
220224
DISABLE_SDIST_BUILD="y"
225+
DISABLE_DOCS="y"
221226
ignore_error: false
222227

223-
- name: fusion-inspection
228+
- name: ci
224229
runner: ubuntu-latest
225230
command: cabal
226231
ghc_version: 9.8.4
227232
# WARNING! cannot use # comments inside pack_options.
228233
pack_options: >-
229234
CABAL_PROJECT=cabal.project
230-
CABAL_BUILD_OPTIONS="--flag fusion-plugin --flag inspection"
231235
DISABLE_SDIST_BUILD="y"
236+
DISABLE_DOCS="y"
237+
DISABLE_BENCH="y"
232238
ignore_error: false
233239

234240
- name: streamly-sdist
@@ -238,7 +244,6 @@ jobs:
238244
# WARNING! cannot use # comments inside pack_options.
239245
pack_options: >-
240246
CABAL_PROJECT=cabal.project.streamly
241-
DISABLE_SDIST_BUILD="y"
242247
ignore_error: true
243248

244249
- name: lstat-readdir
@@ -250,17 +255,21 @@ jobs:
250255
CABAL_PROJECT=cabal.project
251256
CABAL_BUILD_OPTIONS="--flag force-lstat-readdir"
252257
DISABLE_SDIST_BUILD="y"
258+
DISABLE_DOCS="y"
259+
DISABLE_BENCH="y"
253260
ignore_error: false
254261

255-
- name: instrumented
262+
- name: ci
256263
runner: ubuntu-latest
257264
command: cabal
258265
ghc_version: 9.2.8
259266
# WARNING! cannot use # comments inside pack_options.
267+
# GHCUP_GHC_OPTIONS="-u https://s3.ap-south-1.amazonaws.com/downloads.portal.composewell.com/ghc/ghc-9.2.8-x86_64-unknown-linux.tar.xz"
260268
pack_options: >-
261269
CABAL_PROJECT=cabal.project
262-
GHCUP_GHC_OPTIONS="-u https://s3.ap-south-1.amazonaws.com/downloads.portal.composewell.com/ghc/ghc-9.2.8-x86_64-unknown-linux.tar.xz"
263270
DISABLE_SDIST_BUILD="y"
271+
DISABLE_DOCS="y"
272+
DISABLE_BENCH="y"
264273
ignore_error: false
265274

266275
- name: unoptimized
@@ -272,6 +281,7 @@ jobs:
272281
CABAL_PROJECT=cabal.project
273282
DISABLE_SDIST_BUILD="y"
274283
DISABLE_DOCS="y"
284+
DISABLE_BENCH="y"
275285
DISABLE_DIST_CHECKS="y"
276286
CABAL_BUILD_OPTIONS="--flags \"-opt\""
277287
ignore_error: false
@@ -331,9 +341,8 @@ jobs:
331341
with:
332342
# ghcup: ~/.ghcup (macOS), /usr/local/.ghcup (Linux)
333343
path: |
334-
/usr/local/.ghcup
335344
~/.ghcup
336-
key: ${{ matrix.runner }}-${{ env.GHCUP_VERSION }}-${{ matrix.ghc_version }}-v1
345+
key: ${{ matrix.runner }}-ghcup-${{ env.GHCUP_VERSION }}-${{ matrix.ghc_version }}-v1
337346

338347
# XXX If we want to invalidate the cache on resolver change we
339348
# should use a separate cache for stack as it should be keyed on
@@ -408,10 +417,18 @@ jobs:
408417
rm cabal.project
409418
cd "$SUBDIR"
410419
fi
411-
PATH_VAR=/bin:/usr/bin
412420
case "$(uname)" in
421+
Linux)
422+
PATH_VAR=/bin
423+
# On Linux it defaults to /usr/local, during cache restore
424+
# tar is unable to change permissions and restore fails.
425+
export GHCUP_INSTALL_BASE_PREFIX=$HOME
426+
;;
427+
Darwin)
428+
PATH_VAR=/bin:/usr/bin
429+
;;
413430
CYGWIN*|MINGW*|MSYS*)
414-
PATH_VAR="$PATH_VAR:/c/Program Files/7-Zip:/mingw64/bin"
431+
PATH_VAR="/bin:/c/Program Files/7-Zip:/mingw64/bin"
415432
;;
416433
esac
417434
# Use "bash -c" instead of invoking directly to preserve quoted

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ environment:
5555
# If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
5656
# then it is automatically pulled from this URL.
5757
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
58-
PACKCHECK_GITHUB_COMMIT: "8a8e818e51dbadb96628d723eaa42a4e95df9106"
58+
PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
5959

6060
# Override the temp directory to avoid sed escaping issues
6161
# See https://github.com/haskell/cabal/issues/5386

0 commit comments

Comments
 (0)