Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update streamly-0.10.0 #76

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Update streamly-0.10.0 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a9215d
Update the streamly dependency range
adithyaov Dec 1, 2023
31f09e0
Update the CI
adithyaov Dec 1, 2023
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
47 changes: 27 additions & 20 deletions .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,63 +58,70 @@ jobs:
matrix:
include:

- name: 9.2.7-doctest
ghc_version: 9.2.7
- name: 9.8.1-Werror+doctest
ghc_version: 9.8.1
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.6
cabal-version: 3.10.1.0
doctest: "y"
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master-Werror

- name: 9.6.3-macos
ghc_version: 9.6.3
build: cabal-v2
runner: macos-latest
cabal-version: 3.10.1.0
cabal_project: cabal.project.d/master

- name: 9.4.4+Werror
- name: 9.4.4-streamly-0.9.0
ghc_version: 9.4.4
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.8.1.0
cabal_project: cabal.project.Werror
cabal_project: cabal.project.d/streamly-0.9.0

- name: 9.4.4-streamly-0.10.0
ghc_version: 9.4.4
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.8.1.0
cabal_project: cabal.project.d/streamly-0.10.0

- name: 9.2.7+fusion-plugin
ghc_version: 9.2.7
build: cabal-v2
runner: ubuntu-latest
cabal-build-options: --flag fusion-plugin
cabal-version: 3.6
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master

- name: 9.0.2
ghc_version: 9.0.2
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.2
cabal_project: cabal.project.user

- name: 8.10.7
ghc_version: 8.10.7
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.2
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master

- name: 8.10.7+macOS
ghc_version: 8.10.7
build: cabal-v2
runner: macos-latest
cabal-version: 3.2
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master

- name: 8.8.4
ghc_version: 8.8.4
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.2
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master

- name: 8.6.5
ghc_version: 8.6.5
build: cabal-v2
runner: ubuntu-latest
cabal-version: 3.2
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master

- name: hlint
ghc_version: 8.10.7
Expand All @@ -123,7 +130,7 @@ jobs:
hlint_targets: "src test Benchmark"
runner: ubuntu-latest
cabal-version: 3.2
cabal_project: cabal.project.user
cabal_project: cabal.project.d/master

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -166,7 +173,7 @@ jobs:
rm -f cabal-docspec.xz
chmod a+x $HOME/.cabal/bin/cabal-docspec
cabal update
cabal build all --project-file cabal.project.user
cabal build all --project-file cabal.project.d/master
$HOME/.cabal/bin/cabal-docspec --version
$HOME/.cabal/bin/cabal-docspec --timeout 60
else
Expand Down
7 changes: 4 additions & 3 deletions .packcheck.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
.hlint.yaml
hie.yaml
appveyor.yml
cabal.project.Werror
default.nix
stack.yaml
cabal.project
cabal.project.user
cabal.project.d/master
cabal.project.d/master-Werror
cabal.project.d/streamly-0.9.0
cabal.project.d/streamly-0.10.0
14 changes: 14 additions & 0 deletions cabal.project.d/master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
packages: streamly-process.cabal

source-repository-package
type: git
location: https://github.com/composewell/streamly.git
tag: master

source-repository-package
type: git
location: https://github.com/composewell/streamly.git
tag: master
subdir: core

jobs: 1
0 cabal.project.Werror → cabal.project.d/master-Werror
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions cabal.project.d/streamly-0.10.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
packages: streamly-process.cabal

constraints:
streamly == 0.10.0.*
, streamly-core == 0.2.0.*
5 changes: 5 additions & 0 deletions cabal.project.d/streamly-0.9.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
packages: streamly-process.cabal

constraints:
streamly == 0.9.0.*
, streamly-core == 0.1.0.*
14 changes: 0 additions & 14 deletions cabal.project.user
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions streamly-process.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ library
base >= 4.8 && < 5
, exceptions >= 0.8 && < 0.11
-- Uses internal APIs
, streamly == 0.9.0.*
, streamly-core == 0.1.0
, streamly >= 0.9 && < 0.11
, streamly-core >= 0.1 && < 0.3
if !flag(use-native)
build-depends: process >= 1.0 && < 1.7
else
Expand Down Expand Up @@ -126,7 +126,7 @@ benchmark Benchmark.System.Process
, base >= 4.8 && < 5
, directory >= 1.2.2 && < 1.4
-- Uses internal APIs
, streamly-core == 0.1.0.*
, streamly-core
, tasty-bench >= 0.2.5 && < 0.4

if flag(fusion-plugin) && !impl(ghc < 8.6)
Expand All @@ -149,4 +149,4 @@ test-suite Test.System.Process
, hspec >= 2.0 && < 3
, QuickCheck >= 2.10 && < 2.15
-- Uses internal APIs
, streamly-core == 0.1.0.*
, streamly-core
Loading