fix CI

.github/workflows/ci.yml

@@ -12,10 +12,32 @@ jobs:
           - ubuntu-latest
           - macos-latest
         compiler:
-          - ghc8107
           - ghc902
-          - ghc924
-          - ghc946
+          - ghc928
+          - ghc948
+          - ghc965
+          - ghc982
+        dhall:
+          - false
+          - true
+        swagger:
+          - false
+          - true
+        swaggerWrapper:
+          - false
+          - true
+        largeRecords:
+          - false
+          - true
+        exclude:
+          - swagger: false
+            swaggerWrapper: true
+          - compiler: ghc965
+            largeRecords: true
+          - compiler: ghc982
+            largeRecords: true
+          - compiler: ghc902
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3.5.3
@@ -27,5 +49,4 @@ jobs:
         with:
           name: awakesecurity
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix-build --attr proto3-suite --argstr compiler "${{ matrix.compiler }}" --arg enableDhall true --arg enableLargeRecords false
-      - run: nix-build --attr proto3-suite --argstr compiler "${{ matrix.compiler }}" --arg enableDhall true --arg enableLargeRecords true
+      - run: nix-build --attr proto3-suite --argstr compiler "${{ matrix.compiler }}" --arg enableDhall "${{ matrix.dhall }}" --arg enableSwagger "${{ matrix.swagger }}" --arg swaggerWrapperFormat "${{ matrix.swaggerWrapper }}" --arg enableLargeRecords "${{ matrix.largeRecords }}"

src/Proto3/Suite/DhallPB.hs

@@ -30,12 +30,14 @@ import           Dhall                       (FromDhall (..), ToDhall (..))
 import           GHC.Float                   (double2Float, float2Double)
 import           Proto3.Suite.Types          (Enumerated (..), Fixed (..))
 
+#if !(MIN_VERSION_dhall(1,42,0))
 import qualified Data.ByteString
 import qualified Data.ByteString.Base64
 import qualified Data.ByteString.Base64.Lazy
 import qualified Data.ByteString.Lazy
 import qualified Data.Text.Encoding
 import qualified Data.Text.Lazy.Encoding
+#endif
 import qualified Dhall
 
 #if !(MIN_VERSION_dhall(1,27,0))
@@ -63,6 +65,8 @@ instance Dhall.FromDhall a => Dhall.FromDhall (Enumerated a)
 
 instance Dhall.FromDhall a => Dhall.FromDhall (Either Int32 a)
 
+#if !(MIN_VERSION_dhall(1,42,0))
+
 --------------------------------------------------------------------------------
 -- Interpret the strict and lazy ByteString types
 --
@@ -80,6 +84,8 @@ instance Dhall.FromDhall Data.ByteString.ByteString where
     where
       b64Decode =  Data.ByteString.Base64.decodeLenient . Data.Text.Encoding.encodeUtf8
 
+#endif
+
 --------------------------------------------------------------------------------
 -- Interpret integer scalar types
 
@@ -182,6 +188,8 @@ instance Dhall.ToDhall (Fixed Word64) where
 instance Dhall.ToDhall Float where
   injectWith = fmap (contramap float2Double) Dhall.injectWith
 
+#if !(MIN_VERSION_dhall(1,42,0))
+
 --------------------------------------------------------------------------------
 -- Inject strict and lazy ByteStrings
 --
@@ -205,6 +213,8 @@ instance Dhall.ToDhall Data.ByteString.ByteString where
       -- because we Base64 encode the ByteString first
       b64Encode = Data.Text.Encoding.decodeUtf8 . Data.ByteString.Base64.encode
 
+#endif
+
 #if !(MIN_VERSION_dhall(1,27,0))
 --------------------------------------------------------------------------------
 -- Inject maps

tests/TestCodeGen.hs

@@ -12,15 +12,22 @@ module TestCodeGen where
 import           ArbitraryGeneratedTestTypes    ()
 import           Control.Applicative
 import           Control.Monad
+#ifdef SWAGGER
 import qualified Data.Aeson
+#endif
 import qualified Data.ByteString.Lazy           as LBS
 import           Data.Proxy                     (Proxy(..))
 import           Data.String                    (IsString)
+#ifdef SWAGGER
 import           Data.Swagger                   (ToSchema)
 import qualified Data.Swagger
+#endif
 import qualified Data.Text                      as T
-import           Data.Typeable                  (Typeable, splitTyConApp,
-                                                 tyConName, typeRep)
+import           Data.Typeable                  (Typeable, typeRep,
+#ifdef SWAGGER
+                                                 splitTyConApp, tyConName
+#endif
+                                                )
 import           Google.Protobuf.Timestamp      (Timestamp(..))
 import           Prelude                        hiding (FilePath)
 import           Proto3.Suite.Class             (def)
@@ -39,19 +46,23 @@ import qualified Turtle
 import qualified Turtle.Format                  as F
 import qualified TestProto
 import qualified TestProtoOneof
+#ifdef SWAGGER
 import qualified TestProtoWrappers
+#endif
 
 codeGenTests :: TestTree
 codeGenTests = testGroup "Code generator unit tests"
   [ jsonpbTests
-  , swaggerTests
   , hasDefaultTests
-  , swaggerWrapperFormat
   , pascalCaseMessageNames
   , camelCaseMessageFieldNames
   , don'tAlterEnumFieldNames
   , knownTypeMessages
   , pythonInteroperation
+#ifdef SWAGGER
+  , swaggerTests
+  , swaggerWrapperFormat
+#endif
   ]
 
 pythonInteroperation :: TestTree
@@ -67,6 +78,7 @@ pythonInteroperation = testGroup "Python interoperation" $ do
   direction <- [simpleEncodeDotProto, simpleDecodeDotProto]
   pure @[] (direction recStyle isPrefixedArg tt format)
 
+#ifdef SWAGGER
 swaggerWrapperFormat :: TestTree
 swaggerWrapperFormat = testGroup "Swagger Wrapper Format"
     [ expectSchema @TestProtoWrappers.TestDoubleValue
@@ -114,6 +126,7 @@ swaggerWrapperFormat = testGroup "Swagger Wrapper Format"
 #else
         wf = False
 #endif
+#endif
 
 knownTypeMessages :: TestTree
 knownTypeMessages =
@@ -378,6 +391,7 @@ jsonpbTests = testGroup "JSONPB tests"
       ]
   ]
 
+#ifdef SWAGGER
 swaggerTests :: TestTree
 swaggerTests = testGroup "Swagger tests"
   [ schemaOf @TestProtoOneof.Something
@@ -390,6 +404,7 @@ swaggerTests = testGroup "Swagger tests"
       "{\"enum\":[\"DUMMY0\",\"DUMMY1\"],\"type\":\"string\"}"
 
   ]
+#endif
 
 hasDefaultTests :: TestTree
 hasDefaultTests = testGroup "Generic HasDefault"
@@ -456,6 +471,7 @@ decodesAs bs x = testProperty (testName "")  (eitherDecode bs === Right x)
       showString " == Right " .
       showsPrec 11 x
 
+#ifdef SWAGGER
 schemaOf ::
   forall a .
   (ToSchema a, Eq a, Show a, Typeable a) =>
@@ -470,3 +486,4 @@ schemaOf bs = testProperty (testName "") (lbsSchemaOf @a === bs)
 
 lbsSchemaOf :: forall a . ToSchema a => LBS.ByteString
 lbsSchemaOf = Data.Aeson.encode (Data.Swagger.toSchema (Proxy @a))
+#endif