Merge pull request #60 from haskell-servant/maksbotan/bytestring-0.11

Update dependency for bytestring-0.11, add 9.2 CI

Author: maksbotan

.github/workflows/ghcjs.yml

@@ -8,8 +8,8 @@ on:
 
 jobs:
   ghcjs:
-    name: ubuntu-18.04 / ghcjs 8.4
-    runs-on: "ubuntu-18.04"
+    name: ubuntu-20.04 / ghcjs 8.4
+    runs-on: "ubuntu-20.04"
 
     steps:
     - uses: actions/checkout@v2
@@ -20,6 +20,10 @@ jobs:
 
     - name: Install ghcjs and cabal
       run: |
+        sudo apt-get update -y
+        sudo apt-get install -y --no-install-recommends software-properties-common
+        # Needed to get nodejs and npm
+        sudo add-apt-repository -y universe
         # Default GitHub image dropped ppa:hvr/ghc, so we add it ourselves
         sudo add-apt-repository ppa:hvr/ghc
         sudo add-apt-repository ppa:hvr/ghcjs

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.14
+# version: 0.14.3
 #
-# REGENDATA ("0.14",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
+# REGENDATA ("0.14.3",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
 #
 name: Haskell-CI
 on:
@@ -32,6 +32,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.2.2
+            compilerKind: ghc
+            compilerVersion: 9.2.2
+            setup-method: ghcup
+            allow-failure: true
           - compiler: ghc-9.0.2
             compilerKind: ghc
             compilerVersion: 9.0.2
@@ -60,7 +65,7 @@ jobs:
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           if [ "${{ matrix.setup-method }}" = ghcup ]; then
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
             "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
             "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -69,7 +74,7 @@ jobs:
             apt-get update
             apt-get install -y "$HCNAME"
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
             "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
           fi
@@ -244,17 +249,9 @@ jobs:
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
       - name: constraint set servant-0.18
         run: |
-          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all
-          $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all
+          if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
+          if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
       - name: constraint set servant-0.17
         run: |
           if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
           if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
-      - name: constraint set network-3.0
-        run: |
-          if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 3.0.*' --dependencies-only -j2 all ; fi
-          if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 3.0.*' all ; fi
-      - name: constraint set network-2.8
-        run: |
-          if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 2.8.*' --dependencies-only -j2 all ; fi
-          if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 2.8.*' all ; fi

cabal.haskell-ci

@@ -1,19 +1,11 @@
 branches: master
 
-constraint-set network-2.8
-  ghc: >= 8.0 && <8.8
-  constraints: network == 2.8.*
-
-constraint-set network-3.0
-  ghc: >= 8.0 && <8.8
-  constraints: network == 3.0.*
-
 constraint-set servant-0.17
   ghc: >= 8.0 && <8.10
   constraints: servant ==0.17.*
 
 constraint-set servant-0.18
-  ghc: >= 8.0 && <9.4
+  ghc: >= 8.0 && <9.2
   constraints: servant ==0.18.*
 
 constraint-set servant-0.19

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

@@ -20,6 +20,7 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
+   || ==9.2.2
 
 library
   default-language: Haskell2010
@@ -29,7 +30,7 @@ library
   -- ghc boot libs
   build-depends:
       base          >=4.9      && <5
-    , bytestring    >=0.10.8.1 && <0.11
+    , bytestring    >=0.10.8.1 && <0.12
     , text          >=1.2.3.0  && <2.1
     , transformers  >=0.5.2.0  && <0.6
 

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

@@ -19,6 +19,7 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
+   || ==9.2.2
 
 library
   default-language: Haskell2010
@@ -29,7 +30,7 @@ library
   build-depends:
       array         >=0.5.1.1  && <0.6
     , base          >=4.9      && <5
-    , bytestring    >=0.10.8.1 && <0.11
+    , bytestring    >=0.10.8.1 && <0.12
     , text          >=1.2.3.0  && <2.1
     , random        >=0.1.1    && <1.3
 

servant-multipart/servant-multipart.cabal

@@ -19,6 +19,7 @@ tested-with:
      || ==8.8.4
      || ==8.10.7
      || ==9.0.2
+     || ==9.2.2
 
 library
   default-language: Haskell2010
@@ -28,7 +29,7 @@ library
   -- ghc boot libs
   build-depends:
       base          >=4.9      && <5
-    , bytestring    >=0.10.8.1 && <0.11
+    , bytestring    >=0.10.8.1 && <0.12
     , directory     >=1.3      && <1.4
     , text          >=1.2.3.0  && <2.1