Merge 91797e4 into b90107f

.circleci/config.yml

@@ -145,7 +145,7 @@ jobs:
         - *restore
         - run: |
               apt-get install -y ghc-8.2.2
-              apt-get install -y cabal-install-2.4
+              apt-get install -y cabal-install-3.2
               bash -c "$PACKCHECK cabal-v2"
         - *save
   cabal-ghc-8.0.2:
@@ -197,7 +197,7 @@ jobs:
         - run:
             environment:
               BUILD: cabal
-              COVERALLS_OPTIONS: "--repo-token=KlGN45lDWQkw55TNm18nkam2EXRg9lCSH --coverage-mode=StrictlyFullLines --exclude-dir=test test"
+              COVERALLS_OPTIONS: "--repo-token=\"$REPO_TOKEN\" --coverage-mode=StrictlyFullLines --exclude-dir=test test"
               GHC_OPTIONS: "-DCOVERAGE_BUILD"
             command: |
               apt-get install -y ghc-8.2.2
@@ -208,16 +208,39 @@ jobs:
               apt-get install libtinfo-dev
               bash -c "$PACKCHECK cabal-v1"
         - *save
+  coveralls-ghc-8.8.3:
+      <<: *env
+      steps:
+        - checkout
+        - *preinstall
+        - *restore
+        - run:
+            environment:
+              BUILD: cabal-v2
+              COVERALLS_OPTIONS: "--repo-token=\"$REPO_TOKEN\" --coverage-mode=StrictlyFullLines --exclude-dir=test"
+              CABAL_PROJECT: "cabal.project.coverage"
+              CABAL_BUILD_TARGETS: ""
+            command: |
+              apt-get install -y ghc-8.8.3
+              apt-get install -y cabal-install-3.0
+              # required by hpc-coveralls
+              apt-get install -y libcurl4-gnutls-dev
+              apt-get install -y git
+              apt-get install libtinfo-dev
+              bash -c "$PACKCHECK cabal-v2"
+            no_output_timeout: 25m
+        - *save
 
 workflows:
   version: 2
   build:
     jobs:
       #- cabal-ghc-8.6.5
       #- cabal-ghc-8.4.4
-      #- cabal-ghc-8.2.2
+      - cabal-ghc-8.2.2
       #- cabal-ghc-8.0.2
       #- cabal-ghc-7.10.3
       #- stack-ghc-8.4
       #- stack-ghc-8.2
-      - coveralls-ghc-8.2.2
+      #- coveralls-ghc-8.2.2
+      #- coveralls-ghc-8.8.3

.github/workflows/haskell.yml

@@ -28,6 +28,7 @@ jobs:
       BUILD: ${{ matrix.build }}
       GHCVER: ${{ matrix.ghc_version }}
       CABAL_BUILD_OPTIONS: ${{ matrix.cabal_build_options }}
+      CABAL_PROJECT: ${{ matrix.cabal_project }}
       DISABLE_DOCS: ${{ matrix.disable_docs }}
 
     runs-on: ubuntu-latest
@@ -40,11 +41,11 @@ jobs:
           - name: 8.10.1+inspection+Werror
             ghc_version: 8.10.1
             build: cabal-v2
-            cabal_build_options: "--project-file=cabal.project.ci"
+            cabal_project: cabal.project.ci
           - name: 8.8.3+inspection+Werror
             ghc_version: 8.8.3
             build: cabal-v2
-            cabal_build_options: "--project-file=cabal.project.ci"
+            cabal_project: cabal.project.ci
           - name: 8.6.5+streamk
             ghc_version: 8.6.5
             build: cabal-v2
@@ -55,6 +56,10 @@ jobs:
             cabal_build_options: "--flags fusion-plugin"
             # haddock generation does not work with 8.6.5+fusion-plugin
             disable_docs: "y"
+          - name: 8.4.4+debug
+            ghc_version: 8.4.4
+            build: cabal-v2
+            cabal_build_options: "--flag debug"
 
     steps:
     - uses: actions/checkout@v2

.packcheck.ignore

@@ -0,0 +1,2 @@
+.packcheck.ignore
+cabal.project.coverage

.travis.yml

@@ -87,10 +87,10 @@ matrix:
   #- env: BUILD=cabal-v2 GHCVER=head
   #  addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
 
-  - env: BUILD=cabal-v2 GHCVER=8.4.4 GHC_OPTIONS="" CABAL_BUILD_OPTIONS="--flag debug"
-    addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
-    os: linux
-    arch: amd64
+  #- env: BUILD=cabal-v2 GHCVER=8.4.4 GHC_OPTIONS="" CABAL_BUILD_OPTIONS="--flag debug"
+  #  addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
+  #  os: linux
+  #  arch: amd64
 
   # GHC-8.2.2 hogs memory leading to out-of-memory when compiling benchmarks
   #- env: BUILD=cabal-v2 GHCVER=8.2.2 GHC_OPTIONS="" DISABLE_BENCH=y
@@ -207,8 +207,9 @@ matrix:
   #   and then you can use any version of ghc.
   # --------------------------------------------------------------------------
 
-  #- env: BUILD=cabal-v1 COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines --exclude-dir=test test"
-  #  addons: {apt: {packages: [cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
+  - name: "GHC 8.10.1+inspection+Werror+coverage"
+    env: BUILD=cabal-v2 COVERALLS_OPTIONS=" --repo-token=\"$REPO_TOKEN\" --coverage-mode=StrictlyFullLines --exclude-dir=test" CABAL_PROJECT="cabal.project.coverage" GHC_OPTIONS=""
+    addons: {apt: {packages: [cabal-install-3.2,ghc-8.10.1], sources: [hvr-ghc]}}
 
   # --------------------------------------------------------------------------
   # Builds that are allowed to fail

cabal.project.coverage

@@ -0,0 +1,19 @@
+packages:
+  ./
+
+source-repository-package
+  type: git
+  location: https://github.com/composewell/hpc-coveralls
+  tag: d05f0c68aabec6120f8a96a9b5181b21a8f364df
+
+package hpc-coveralls
+  tests: false
+
+package streamly
+  ghc-options: -Werror
+  flags: inspection
+  coverage: true
+
+package streamly-benchmarks
+  ghc-options: -Werror
+  flags: inspection