Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ task:
# What to build
# ------------------------------------------------------------------------
# DISABLE_TEST: "y"
# DISABLE_BENCH: "y"
# DISABLE_DOCS: "y"
DISABLE_BENCH: "y"
DISABLE_DOCS: "y"
DISABLE_SDIST_BUILD: "y"
# DISABLE_SDIST_GIT_CHECK: "y"
DISABLE_DIST_CHECKS: "y"
Expand Down Expand Up @@ -56,7 +56,7 @@ task:
# If you have not committed packcheck.sh in your repo at PACKCHECK
# then it is automatically pulled from this URL.
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
PACKCHECK_GITHUB_COMMIT: "6ee4502650b49cbbdb583fc7a55731738c9303df"
PACKCHECK_GITHUB_COMMIT: "b3743510c7c26f83254ffd9ef91bcd71560cff05"

cabal_cache:
folder: ~/.cabal
Expand Down
43 changes: 12 additions & 31 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ jobs:
BUILD_PREFETCH=y
GHCUP_VERSION=latest
GHCVER=${{ matrix.ghc_version }}
DISABLE_SDIST_BUILD="y"
DISABLE_BENCH="y"
DISABLE_DOCS="y"

# WARNING! you cannot use comments in this
CABAL_OPTIONS: >-
Expand All @@ -109,7 +112,7 @@ jobs:
# If you have not committed packcheck.sh in your repo at PACKCHECK
# then it is automatically pulled from this URL.
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
PACKCHECK_GITHUB_COMMIT: "669c3b553add086bb8a667049ac21cf83499cf13"
PACKCHECK_GITHUB_COMMIT: "b3743510c7c26f83254ffd9ef91bcd71560cff05"

# Pull token from "secrets" setting of the github repo
#COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
Expand Down Expand Up @@ -169,17 +172,17 @@ jobs:
# DISABLE_SDIST_BUILD="y"
# ignore_error: true

- name: fusion
# Disable sdist build so that we can test all packages.
- name: fusion-bench-doc
runner: ubuntu-latest
command: cabal
ghc_version: 9.14.1
# WARNING! cannot use # comments inside pack_options.
pack_options: >-
CABAL_PROJECT=cabal.project
CABAL_BUILD_OPTIONS="--flag limit-build-mem --flag fusion-plugin"
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
DISABLE_DOCS="n"
DISABLE_BENCH="n"
ignore_error: false

- name: streamly-core-sdist
Expand All @@ -189,21 +192,18 @@ jobs:
subdir: core
ignore_error: false

- name: debug-unoptimized
- name: debug-no-opt
runner: macos-latest
command: cabal
ghc_version: 9.14.1
# WARNING! cannot use # comments inside pack_options.
pack_options: >-
CABAL_PROJECT=cabal.project
CABAL_BUILD_OPTIONS="--flag debug --flag -opt"
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
ignore_error: false

# Takes too long, so bench is disabled
- name: ghc-9.12.4
- name: nightly-2026-03-10
runner: macos-latest
command: stack
# WARNING! cannot use # comments inside pack_options.
Expand All @@ -212,11 +212,8 @@ jobs:
STACK_UPGRADE="y"
RESOLVER=nightly-2026-03-10
STACK_YAML=stack.yaml
DISABLE_SDIST_BUILD="y"
SDIST_OPTIONS="--ignore-check"
DISABLE_DIST_CHECKS="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
ignore_error: false

# Note: use linux for warning build for convenient dev testing
Expand All @@ -240,8 +237,6 @@ jobs:
pack_options: >-
CABAL_PROJECT=cabal.project
CABAL_BUILD_OPTIONS="--flag fusion-plugin --flag inspection"
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
ignore_error: false

- name: ci
Expand All @@ -251,9 +246,6 @@ jobs:
# WARNING! cannot use # comments inside pack_options.
pack_options: >-
CABAL_PROJECT=cabal.project
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
ignore_error: false

- name: streamly-sdist
Expand All @@ -263,6 +255,7 @@ jobs:
# WARNING! cannot use # comments inside pack_options.
pack_options: >-
CABAL_PROJECT=cabal.project.streamly
DISABLE_SDIST_BUILD="n"
ignore_error: true

- name: lstat-readdir
Expand All @@ -273,12 +266,9 @@ jobs:
pack_options: >-
CABAL_PROJECT=cabal.project
CABAL_BUILD_OPTIONS="--flag force-lstat-readdir"
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
ignore_error: false

- name: ci
- name: custom-ghc
runner: ubuntu-latest
command: cabal
ghc_version: 9.2.8
Expand All @@ -288,9 +278,6 @@ jobs:
pack_options: >-
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"
CABAL_PROJECT=cabal.project
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
ignore_error: false

- name: unoptimized
Expand All @@ -300,10 +287,6 @@ jobs:
# WARNING! cannot use # comments inside pack_options.
pack_options: >-
CABAL_PROJECT=cabal.project
DISABLE_SDIST_BUILD="y"
DISABLE_DOCS="y"
DISABLE_BENCH="y"
DISABLE_DIST_CHECKS="y"
CABAL_BUILD_OPTIONS="--flags \"-opt\""
ignore_error: false

Expand All @@ -314,8 +297,6 @@ jobs:
# WARNING! cannot use # comments inside pack_options.
pack_options: >-
CABAL_PROJECT=cabal.project
CABAL_BUILD_OPTIONS="--flag limit-build-mem"
DISABLE_SDIST_BUILD="y"
ignore_error: false

#- name: ci
Expand Down
18 changes: 13 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# You can use any of the options supported by packcheck as environment
# variables here. See https://github.com/composewell/packcheck for all
# options and their explanation.
#

branches:
only:
- master
Expand All @@ -23,7 +23,7 @@ environment:
# ------------------------------------------------------------------------
#
GHCUP_VERSION: "0.1.50.2"
GHCVER: "9.14.1"
GHCVER: "9.12.4"
#CABALVER: "3.10.3.0"

# ------------------------------------------------------------------------
Expand All @@ -33,10 +33,13 @@ environment:
DISABLE_BENCH: "y"
DISABLE_DOCS: "y"
DISABLE_DIST_CHECKS: "y"
# On Windows, DISABLE_SDIST_BUILD is useful for (1) avoiding
# path length restriction, (2) avoid installing autoreconf
# for configure builds.
DISABLE_SDIST_BUILD: "y"
# Note: these require the "diff" utility.
# DISABLE_SDIST_GIT_CHECK: "y"
# DISABLE_SDIST_PROJECT_CHECK: "y"
DISABLE_SDIST_PROJECT_CHECK: "y"

# ------------------------------------------------------------------------
# cabal options
Expand All @@ -55,12 +58,16 @@ environment:
# If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
# then it is automatically pulled from this URL.
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
PACKCHECK_GITHUB_COMMIT: "b3743510c7c26f83254ffd9ef91bcd71560cff05"

# Override the temp directory to avoid sed escaping issues
# See https://github.com/haskell/cabal/issues/5386
TMP: "c:\\tmp"

# ------------------------------------------------------------------------
# Usually you do not need to change anything below this line
# ------------------------------------------------------------------------

# Bump the -> version to clear the cache
# packcheck uses "%APPDATA%\\local" to install tools like hlint etc.
# cabal may use "%APPDATA%\\cabal" or "c:\\cabal"
Expand All @@ -72,7 +79,8 @@ cache:
- "C:\\ghcup"
- "C:\\cabal"

# Folder where the repository is cloned.
# Folder where the repository is cloned. Kept as short as possible to avoid
# long path issues on Windows.
clone_folder: "c:\\pkg"
build: off

Expand Down
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ packages: streamly.cabal
, bench-test-lib/bench-test-lib.cabal

-- For debugging heap overflow
jobs: 1
-- jobs: 1

source-repository-package
type: git
Expand Down
2 changes: 1 addition & 1 deletion cabal.project.Werror
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ packages:
bench-test-lib

-- For debugging heap overflow
jobs: 1
-- jobs: 1

package streamly
ghc-options: -Werror
Expand Down
34 changes: 17 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Streamly";

inputs = {
basepkgs.url = "git+ssh://git@github.com/composewell/streamly-packages?rev=5c3c31fa35f9f75a52e2fd68f7d1d47f7622ce33";
basepkgs.url = "git+ssh://git@github.com/composewell/streamly-packages?rev=69728978adc44f53b3dd907acb2eb5bd2415fd60";
nixpkgs.follows = "basepkgs/nixpkgs";
nixpkgs-darwin.follows = "basepkgs/nixpkgs-darwin";
};
Expand Down
16 changes: 10 additions & 6 deletions sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ layers = [
{
streamly = local ./.;
streamly-core = local ./core;
streamly-benchmarks = localOpts ./benchmark
["--benchmark --flag fusion-plugin --flag inspection"]
["--flags fusion-plugin"];
streamly-tests = localOpts ./test
["--flag fusion-plugin"]
["--flags fusion-plugin"];
streamly-benchmarks = local ./benchmark
// { c2nix = ["--flag fusion-plugin --flag inspection"];
flags = ["--flags fusion-plugin"];
};
streamly-tests = local ./test
// { c2nix = ["--flag fusion-plugin"];
flags = ["--flags fusion-plugin"];
};
bench-test-lib = local ./bench-test-lib;

network = hackage "3.2.7.0" "08frm9gm422b9aqlmmzflj0yr80ic0ip8s4gsmr0izhizzab5420";
}
];
}
19 changes: 9 additions & 10 deletions streamly.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,15 @@ homepage: https://streamly.composewell.com
bug-reports: https://github.com/composewell/streamly/issues
license: BSD-3-Clause
license-file: LICENSE
tested-with: GHC==8.6.5
, GHC==8.8.4
, GHC==8.10.7
, GHC==9.0.2
, GHC==9.2.8
, GHC==9.4.7
, GHC==9.6.3
, GHC==9.8.1
, GHC==9.10.1
, GHC==9.12.1
tested-with:
GHC==8.10.7
, GHC==9.2.8
, GHC==9.4.7
, GHC==9.6.3
, GHC==9.8.4
, GHC==9.10.3
, GHC==9.12.4
, GHC==9.14.1
author: Composewell Technologies
maintainer: streamly@composewell.com
copyright: 2017 Composewell Technologies
Expand Down
Loading
Loading