diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index bac0cf6d..304ce9d2 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -58,20 +58,34 @@ 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 @@ -79,42 +93,35 @@ jobs: 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 @@ -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 @@ -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 diff --git a/.packcheck.ignore b/.packcheck.ignore index 7b5b58c7..7fa4d3f8 100644 --- a/.packcheck.ignore +++ b/.packcheck.ignore @@ -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 diff --git a/cabal.project.d/master b/cabal.project.d/master new file mode 100644 index 00000000..f46efee9 --- /dev/null +++ b/cabal.project.d/master @@ -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 diff --git a/cabal.project.Werror b/cabal.project.d/master-Werror similarity index 100% rename from cabal.project.Werror rename to cabal.project.d/master-Werror diff --git a/cabal.project.d/streamly-0.10.0 b/cabal.project.d/streamly-0.10.0 new file mode 100644 index 00000000..3da17284 --- /dev/null +++ b/cabal.project.d/streamly-0.10.0 @@ -0,0 +1,5 @@ +packages: streamly-process.cabal + +constraints: + streamly == 0.10.0.* + , streamly-core == 0.2.0.* diff --git a/cabal.project.d/streamly-0.9.0 b/cabal.project.d/streamly-0.9.0 new file mode 100644 index 00000000..934a537c --- /dev/null +++ b/cabal.project.d/streamly-0.9.0 @@ -0,0 +1,5 @@ +packages: streamly-process.cabal + +constraints: + streamly == 0.9.0.* + , streamly-core == 0.1.0.* diff --git a/cabal.project.user b/cabal.project.user deleted file mode 100644 index a90a8e66..00000000 --- a/cabal.project.user +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/streamly-process.cabal b/streamly-process.cabal index 41d9c451..de94448f 100644 --- a/streamly-process.cabal +++ b/streamly-process.cabal @@ -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 @@ -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) @@ -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