Remove streamly-core from extra-source files

This commit is contained in:
Ranjeet Kumar Ranjan 2022-09-28 14:59:54 +05:30 committed by Harendra Kumar
parent 2c84b4ddc7
commit 8a76b6730a
6 changed files with 25 additions and 148 deletions

View File

@ -59,7 +59,7 @@ env: &env
# 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: "35efa99b2082d13722b8a0183ac6455df98e91b9"
PACKCHECK_GITHUB_COMMIT: "a302772c8f3791c477edd1764b82f8d1f5b22fdf"
executors:
amd64-executor:
@ -150,6 +150,7 @@ jobs:
DISABLE_TEST: "yes"
DISABLE_BENCH: "yes"
DISABLE_DIST_CHECKS: "yes"
DISABLE_SDIST_BUILD: "yes"
command: |
apt-get install -y ghc-8.10.4
apt-get install -y cabal-install-3.4
@ -385,8 +386,9 @@ jobs:
- run:
name: Hlint src
environment:
BUILD: cabal-v2
BUILD: hlint
HLINT_OPTIONS: lint
DISABLE_SDIST_BUILD: "yes"
HLINT_TARGETS: core/src src test benchmark
command: |
bash -c "$PACKCHECK $BUILD" || exit 1

View File

@ -41,7 +41,7 @@ jobs:
# packcheck location and revision
PACKCHECK_LOCAL_PATH: "./packcheck.sh"
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
PACKCHECK_GITHUB_COMMIT: "075e13ab716c67d2110db4905ae42b0280af046d"
PACKCHECK_GITHUB_COMMIT: "a302772c8f3791c477edd1764b82f8d1f5b22fdf"
# Pull token from "secrets" setting of the github repo
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
@ -55,7 +55,7 @@ jobs:
matrix:
# The order is important to optimize fail-fast.
name:
- 8.10.7-sdist-fusion-inspection-Werror
- 8.10.7-fusion-inspection-Werror
- 9.2.4-docspec
# - 8.10.7-coverage
@ -93,14 +93,14 @@ jobs:
doctest: "y"
cabal_version: 3.6.2.0
cabal_project: cabal.project
disable_sdist_build: "y"
ignore_error: false
- name: 9.0.2
ghc_version: 9.0.2
runner: ubuntu-latest
build: cabal
cabal_version: 3.6.2.0
cabal_project: cabal.project.902
disable_sdist_build: "y"
cabal_project: cabal.project.streamly
ignore_error: true
- name: 8.10.7-sdist-stack
runner: ubuntu-latest
@ -125,12 +125,13 @@ jobs:
# coverage: "y"
# cabal_version: 3.6.2.0
# ignore_error: false
- name: 8.10.7-sdist-fusion-inspection-Werror
- name: 8.10.7-fusion-inspection-Werror
ghc_version: 8.10.7
runner: ubuntu-latest
build: cabal
cabal_version: 3.6.2.0
cabal_project: cabal.project.Werror
disable_sdist_build: "y"
cabal_build_options: "--flag fusion-plugin --flag inspection"
ignore_error: false
- name: 8.8.4-sdist-fusion
@ -138,7 +139,7 @@ jobs:
runner: ubuntu-latest
build: cabal
cabal_version: 3.6.2.0
cabal_project: cabal.project
cabal_project: cabal.project.streamly
cabal_build_options: "--flag fusion-plugin"
ignore_error: false
- name: 8.6.5-sdist-no-fusion-unoptimized
@ -146,7 +147,7 @@ jobs:
runner: ubuntu-latest
build: cabal
cabal_version: 3.6.2.0
cabal_project: cabal.project
cabal_project: cabal.project.streamly
cabal_build_options: "--flag no-fusion --flag -opt"
ignore_error: false
- name: 8.6.5-sdist-debug-unoptimized
@ -154,7 +155,7 @@ jobs:
runner: ubuntu-latest
build: cabal
cabal_version: 3.6.2.0
cabal_project: cabal.project
cabal_project: cabal.project.streamly
cabal_build_options: "--flag debug --flag -opt"
ignore_error: false

View File

@ -25,6 +25,7 @@ cabal.project.packdiff
cabal.project.Werror
cabal.project.Werror-nocode
cabal.project.902
cabal.project.streamly
default.nix
examples/README.md
hie.yaml
@ -33,3 +34,4 @@ targets/default.nix
targets/cabal.project
test/test-runner/default.nix
test/test-runner/cabal.project
core/

View File

@ -1,23 +0,0 @@
packages: streamly.cabal
, core/streamly-core.cabal
, test/streamly-tests.cabal
, benchmark/streamly-benchmarks.cabal
, docs/streamly-docs.cabal
package base-orphans
ghc-options: -optlm "--unresolved-symbols=ignore-all"
package heaps
ghc-options: -optlm "--unresolved-symbols=ignore-all"
package network
ghc-options: -optlm "--unresolved-symbols=ignore-all"
package HUnit
ghc-options: -optlm "--unresolved-symbols=ignore-all"
package colour
ghc-options: -optlm "--unresolved-symbols=ignore-all"
package clock
ghc-options: -optlm "--unresolved-symbols=ignore-all"

10
cabal.project.streamly Normal file
View File

@ -0,0 +1,10 @@
packages: streamly.cabal
, test/streamly-tests.cabal
, benchmark/streamly-benchmarks.cabal
, docs/streamly-docs.cabal
source-repository-package
type: git
location: https://github.com/composewell/streamly
tag: master
subdir: core

View File

@ -123,121 +123,6 @@ extra-source-files:
benchmark/Streamly/Benchmark/Unicode/data/English.txt
benchmark/Streamly/Benchmark/Unicode/data/Korean.txt
-- Include streamly-core when packaging
-- This is temporary as we will soon break this package out
core/configure
core/configure.ac
core/src/assert.hs
core/src/config.h.in
core/src/inline.hs
core/src/Streamly/Internal/Data/Array/ArrayMacros.h
core/src/Streamly/Internal/Data/Time/Clock/config-clock.h
core/src/Streamly/Internal/BaseCompat.hs
core/src/Streamly/Internal/Control/Exception.hs
core/src/Streamly/Internal/Control/Monad.hs
core/src/Streamly/Internal/Control/ForkIO.hs
core/src/Streamly/Internal/Data/Cont.hs
core/src/Streamly/Internal/System/IO.hs
core/src/Streamly/Internal/Data/IsMap.hs
core/src/Streamly/Internal/Data/Tuple/Strict.hs
core/src/Streamly/Internal/Data/Maybe/Strict.hs
core/src/Streamly/Internal/Data/Either/Strict.hs
core/src/Streamly/Internal/Control/Concurrent.hs
core/src/Streamly/Internal/Control/ForkLifted.hs
core/src/Streamly/Internal/Data/IOFinalizer.hs
core/src/Streamly/Internal/Data/Time/TimeSpec.hsc
core/src/Streamly/Internal/Data/Time/Units.hs
core/src/Streamly/Internal/Data/Time/Clock/Type.hsc
core/src/Streamly/Internal/Data/Time/Clock.hs
core/src/Streamly/Internal/Data/SVar/Type.hs
core/src/Streamly/Internal/Data/Stream/StreamK/Type.hs
core/src/Streamly/Internal/Data/Fold/Step.hs
core/src/Streamly/Internal/Data/Refold/Type.hs
core/src/Streamly/Internal/Data/Fold/Type.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Step.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Type.hs
core/src/Streamly/Internal/Data/Stream/StreamDK/Type.hs
core/src/Streamly/Internal/Data/Unfold/Type.hs
core/src/Streamly/Internal/Data/Producer/Type.hs
core/src/Streamly/Internal/Data/Producer.hs
core/src/Streamly/Internal/Data/Producer/Source.hs
core/src/Streamly/Internal/Data/Parser/ParserK/Type.hs
core/src/Streamly/Internal/Data/Parser/ParserD/Type.hs
core/src/Streamly/Internal/Data/Pipe/Type.hs
core/src/Streamly/Internal/Data/Unboxed.hs
core/src/Streamly/Internal/Data/IORef/Unboxed.hs
core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Type.hs
core/src/Streamly/Internal/Data/Array/Unboxed/Mut.hs
core/src/Streamly/Internal/Data/Array/Unboxed/Type.hs
core/src/Streamly/Internal/Data/Array/Mut/Type.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Transform.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Exception.hs
core/src/Streamly/Internal/Data/Stream/StreamD/Lift.hs
core/src/Streamly/Internal/Data/Stream/StreamD.hs
core/src/Streamly/Internal/Data/Stream/StreamDK.hs
core/src/Streamly/Internal/Data/Stream/Common.hs
core/src/Streamly/Internal/Data/Parser/ParserD/Tee.hs
core/src/Streamly/Internal/Data/Parser/ParserD.hs
core/src/Streamly/Internal/Data/Unfold.hs
core/src/Streamly/Internal/Data/Unfold/Enumeration.hs
core/src/Streamly/Internal/Data/Fold/Tee.hs
core/src/Streamly/Internal/Data/Fold.hs
core/src/Streamly/Internal/Data/Parser.hs
core/src/Streamly/Internal/Data/Pipe.hs
core/src/Streamly/Internal/Data/Stream.hs
core/src/Streamly/Internal/Data/Stream/Bottom.hs
core/src/Streamly/Internal/Data/Stream/Eliminate.hs
core/src/Streamly/Internal/Data/Stream/Enumerate.hs
core/src/Streamly/Internal/Data/Stream/Exception.hs
core/src/Streamly/Internal/Data/Stream/Expand.hs
core/src/Streamly/Internal/Data/Stream/Generate.hs
core/src/Streamly/Internal/Data/Stream/Lift.hs
core/src/Streamly/Internal/Data/Stream/Reduce.hs
core/src/Streamly/Internal/Data/Stream/Top.hs
core/src/Streamly/Internal/Data/Stream/Transform.hs
core/src/Streamly/Internal/Data/Stream/Type.hs
core/src/Streamly/Internal/Data/Stream/Zip.hs
core/src/Streamly/Internal/Data/List.hs
core/src/Streamly/Internal/Data/Array.hs
core/src/Streamly/Internal/Data/Array/Unboxed.hs
core/src/Streamly/Internal/Data/Array/Unboxed/Stream.hs
core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Stream.hs
core/src/Streamly/Internal/Data/Array/Unboxed/Stream/Fold.hs
core/src/Streamly/Internal/Data/Ring/Unboxed.hs
core/src/Streamly/Internal/Data/Ring.hs
core/src/Streamly/Internal/Data/Stream/StreamK.hs
core/src/Streamly/Data/Stream.hs
core/src/Streamly/Data/Fold.hs
core/src/Streamly/Data/Fold/Tee.hs
core/src/Streamly/Data/Parser.hs
core/src/Streamly/Data/Unfold.hs
core/src/Streamly/Internal/Data/Fold/Window.hs
core/src/Streamly/Data/Unbox.hs
core/src/Streamly/Data/Array.hs
core/src/Streamly/Data/Array/Unboxed.hs
core/src/Streamly/Data/Array/Unboxed/Mut.hs
core/src/Streamly/FileSystem/Handle.hs
core/src/Streamly/Internal/Data/Binary/Decode.hs
core/src/Streamly/Internal/Data/Time/Clock/Darwin.c
core/src/Streamly/Internal/Data/Time/Clock/Windows.c
core/src/Streamly/Internal/FileSystem/Handle.hs
core/src/Streamly/Internal/Unicode/Array/Char.hs
core/src/Streamly/Internal/Unicode/Char/Parser.hs
core/src/Streamly/Internal/Unicode/Stream.hs
core/src/Streamly/Internal/Unicode/String.hs
core/src/Streamly/Unicode/Parser.hs
core/src/Streamly/Unicode/Stream.hs
core/src/Streamly/Unicode/String.hs
core/src/Streamly/Console/Stdio.hs
core/src/Streamly/Internal/Console/Stdio.hs
core/streamly-core.cabal
core/jsbits/clock.js
core/Setup.hs
extra-doc-files:
CONTRIBUTING.md
CHANGELOG.md