Update CI

Author: maksbotan

.github/workflows/haskell-ci.yml

@@ -1,6 +1,6 @@
 # This GitHub workflow config has been generated by a script via
 #
-#   haskell-ci 'github' '--config=cabal.haskell-ci' 'servant-multipart.cabal'
+#   haskell-ci 'github' '--config=cabal.haskell-ci' 'cabal.project'
 #
 # To regenerate the script (for example after adjusting tested-with) run
 #
@@ -10,7 +10,7 @@
 #
 # version: 0.12
 #
-# REGENDATA ("0.12",["github","--config=cabal.haskell-ci","servant-multipart.cabal"])
+# REGENDATA ("0.12",["github","--config=cabal.haskell-ci","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -122,7 +122,9 @@ jobs:
       - name: initial cabal.project for sdist
         run: |
           touch cabal.project
-          echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
+          echo "packages: $GITHUB_WORKSPACE/source/servant-multipart" >> cabal.project
+          echo "packages: $GITHUB_WORKSPACE/source/servant-multipart-api" >> cabal.project
+          echo "packages: $GITHUB_WORKSPACE/source/servant-multipart-client" >> cabal.project
           cat cabal.project
       - name: sdist
         run: |
@@ -136,14 +138,24 @@ jobs:
         run: |
           PKGDIR_servant_multipart="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/servant-multipart-[0-9.]*')"
           echo "PKGDIR_servant_multipart=${PKGDIR_servant_multipart}" >> $GITHUB_ENV
+          PKGDIR_servant_multipart_api="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/servant-multipart-api-[0-9.]*')"
+          echo "PKGDIR_servant_multipart_api=${PKGDIR_servant_multipart_api}" >> $GITHUB_ENV
+          PKGDIR_servant_multipart_client="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/servant-multipart-client-[0-9.]*')"
+          echo "PKGDIR_servant_multipart_client=${PKGDIR_servant_multipart_client}" >> $GITHUB_ENV
           touch cabal.project
           touch cabal.project.local
           echo "packages: ${PKGDIR_servant_multipart}" >> cabal.project
+          echo "packages: ${PKGDIR_servant_multipart_api}" >> cabal.project
+          echo "packages: ${PKGDIR_servant_multipart_client}" >> cabal.project
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package servant-multipart" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package servant-multipart-api" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package servant-multipart-client" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(servant-multipart)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(servant-multipart|servant-multipart-api|servant-multipart-client)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan
@@ -173,6 +185,10 @@ jobs:
         run: |
           cd ${PKGDIR_servant_multipart} || false
           ${CABAL} -vnormal check
+          cd ${PKGDIR_servant_multipart_api} || false
+          ${CABAL} -vnormal check
+          cd ${PKGDIR_servant_multipart_client} || false
+          ${CABAL} -vnormal check
       - name: haddock
         run: |
           $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

servant-multipart-api/servant-multipart-api.cabal

@@ -17,7 +17,7 @@ category:           Web, Servant
 build-type:         Simple
 cabal-version:      >=1.10
 extra-source-files: CHANGELOG.md
-tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4
 
 library
   default-language: Haskell2010

servant-multipart-client/servant-multipart-client.cabal

@@ -17,7 +17,7 @@ category:           Web, Servant
 build-type:         Simple
 cabal-version:      >=1.10
 extra-source-files: CHANGELOG.md
-tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4
 
 library
   default-language: Haskell2010