Merge pull request #48 from EarnestResearch/INFRA-535

remove nix, bump dependencies
EarnestResearch · Feb 23, 2024 · 07eed0b · 07eed0b
2 parents 7543d87 + a1ed020
commit 07eed0b
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 81 deletions.
diff --git a/.envrc b/.envrc
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,17 +3,12 @@ name: Test
 on: [push]
 
 jobs:
-  tests:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+  build:
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected]
-    - uses: cachix/install-nix-action@v13
-    - uses: cachix/cachix-action@v10
-      with:
-        name: earnestresearch-public
-        signingKey: '${{ secrets.EARNESTRESEARCH_PUBLIC_CACHIX_SIGNING_KEY }}'
-    - run: nix-build ci.nix
-    - run: nix-shell --run "exit 0"
+      - uses: actions/checkout@v3
+      - uses: haskell-actions/setup@v2
+        with:
+          ghc-version: '9.6.4'
+          cabal-version: 'latest'
+      - run: cabal build all
diff --git a/ci.nix b/ci.nix
diff --git a/default.nix b/default.nix
diff --git a/honeycomb-example/example.cabal b/honeycomb-example/example.cabal
@@ -26,7 +26,7 @@ executable honeycomb-example
   -- other-modules:
   -- other-extensions:
   build-depends:
-      base                          >=4.13 && <4.14
+      base                          >=4.13
     , honeycomb
     , honeycomb-servant-client-rio
     , honeycomb-servant-server-rio

diff --git a/honeycomb-example/src/Main.hs b/honeycomb-example/src/Main.hs
@@ -20,7 +20,6 @@ import Servant.Client
 import Servant.Client.Honeycomb.RIO
 import Servant.Server.Honeycomb.RIO
 import qualified RIO.HashMap as HM
-import qualified RIO.Text as T
 
 type FibonacciApi =
   "fib" :> Capture "index" Int :> Get '[JSON] Int
@@ -45,12 +44,14 @@ runGetFibonacci index
 runGetHealthcheck :: RIO AppEnv Text
 runGetHealthcheck = pure "ok"
 
+fibonacciServer :: (Int -> RIO AppEnv Int) :<|> RIO AppEnv Text
 fibonacciServer =
   runGetFibonacci
     :<|> runGetHealthcheck
 
 -- client implementations
 
+getFibonacci :: Int -> RIO AppEnv Int
 getFibonacci :<|> getHealthcheck =
   traceClientRIO Proxy fibonacciApi
 

diff --git a/honeycomb-servant-client-rio/honeycomb-servant-client-rio.cabal b/honeycomb-servant-client-rio/honeycomb-servant-client-rio.cabal
@@ -25,7 +25,7 @@ source-repository head
 
 library
   build-depends:
-    , base                      >=4.11 && <10
+    , base                      >=4.11
     , honeycomb
     , honeycomb-servant
     , honeycomb-servant-client

diff --git a/honeycomb-servant-client/honeycomb-servant-client.cabal b/honeycomb-servant-client/honeycomb-servant-client.cabal
@@ -25,7 +25,7 @@ source-repository head
 
 library
   build-depends:
-    , base                 >=4.11 && <10
+    , base                 >=4.11
     , containers
     , exceptions
     , honeycomb

diff --git a/honeycomb-servant-client/src/Servant/Client/Honeycomb.hs b/honeycomb-servant-client/src/Servant/Client/Honeycomb.hs
@@ -49,12 +49,12 @@ instance Alt (TraceClientM env) where
   a <!> b = a `catchIO` const b
 
 instance (HasClientEnv env, HC.HasSpanContext env) => RunClient (TraceClientM env) where
-  runRequest req =
+  runRequestAcceptStatus ss req =
     do
       spanContext <- view HC.spanContextL
       clientEnv <- view clientEnvL
       let reqWithTraceHeader = traceValue spanContext req
-      nt clientEnv $ performRequest reqWithTraceHeader
+      nt clientEnv $ performRequest ss reqWithTraceHeader
     where
       nt :: ClientEnv -> ClientM response -> TraceClientM env response
       nt clientEnv (ClientM response) =

diff --git a/honeycomb-servant-server/honeycomb-servant-server.cabal b/honeycomb-servant-server/honeycomb-servant-server.cabal
@@ -25,7 +25,7 @@ source-repository head
 
 library
   build-depends:
-    , base               >=4.11 && <10
+    , base               >=4.11
     , containers
     , honeycomb
     , honeycomb-servant

diff --git a/honeycomb-servant/honeycomb-servant.cabal b/honeycomb-servant/honeycomb-servant.cabal
@@ -25,7 +25,7 @@ source-repository head
 
 library
   build-depends:
-    , base                  >=4.11 && <10
+    , base                  >=4.11
     , containers
     , honeycomb
     , honeycomb-wai

diff --git a/honeycomb-wai/honeycomb-wai.cabal b/honeycomb-wai/honeycomb-wai.cabal
@@ -40,7 +40,7 @@ library
     ghc-options: -fwrite-ide-info
 
   build-depends:
-    , base                  >=4.10 && <10
+    , base                  >=4.10
     , bytestring
     , honeycomb
     , http-types

diff --git a/honeycomb-wai/src/Network/Wai/Honeycomb.hs b/honeycomb-wai/src/Network/Wai/Honeycomb.hs
@@ -12,7 +12,8 @@ module Network.Wai.Honeycomb
   )
 where
 
-import Control.Monad.Reader (MonadReader, join, local)
+import Control.Monad (join)
+import Control.Monad.Reader (MonadReader, local)
 import qualified Data.HashMap.Strict as HM
 import Data.IP
 import qualified Data.List as List

diff --git a/honeycomb/honeycomb.cabal b/honeycomb/honeycomb.cabal
@@ -50,7 +50,7 @@ common shared-properties
 
   build-depends:
     , aeson
-    , base                  >=4.11 && <10
+    , base                  >=4.11
     , bytestring
     , hashable
     , http-client

diff --git a/honeycomb/src/Honeycomb/Core.hs b/honeycomb/src/Honeycomb/Core.hs
@@ -13,7 +13,8 @@ module Honeycomb.Core
   )
 where
 
-import Control.Monad.Reader (MonadReader, local, void)
+import Control.Monad (void)
+import Control.Monad.Reader (MonadReader, local)
 import Data.Maybe (isJust)
 import qualified Data.Text as T
 import Honeycomb.Core.Internal.Types

diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
diff --git a/shell.nix b/shell.nix