Skip to content

Commit

Permalink
Upgrade to grpc-1.42.0 (#152)
Browse files Browse the repository at this point in the history
- Upgraded the pinned nixpkgs to nixos-21.11 which contains grpc-1.42.0. This requires no code changes to `grpc-haskell` and `grpc-haskell-core` libraries.
- Picked up latest commits of `proto3-{wire,suite}` and adjusted transitive dependencies
- Switched to python 3 because `grpcio-tools` requires it. Adjusted test scripts accordingly.
- Upgraded to latest CI action versions.

This change is minimal compared to #138 and will solve some test failures in that PR. Hopefully, this will make it easier to move that PR forward.
  • Loading branch information
rkaippully authored Jun 16, 2023
1 parent 53614aa commit a068444
Show file tree
Hide file tree
Showing 23 changed files with 360 additions and 251 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
build-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.0.2
- uses: actions/checkout@v3.5.3
name: Checkout
- uses: cachix/install-nix-action@v20
- uses: cachix/install-nix-action@v21
name: Install Nix
- uses: cachix/cachix-action@v12
name: Set up Cachix
Expand All @@ -21,9 +21,9 @@ jobs:
build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3.0.2
- uses: actions/checkout@v3.5.3
name: Checkout
- uses: cachix/install-nix-action@v20
- uses: cachix/install-nix-action@v21
name: Install Nix
- uses: cachix/cachix-action@v12
name: Set up Cachix
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ have extended and released under the same [`LICENSE`](./LICENSE)
Installation
------------

**The current version of this library requires gRPC version 1.34.1. Newer versions may work but have not been tested.**
**The current version of this library requires gRPC version 1.42.0. Newer versions may work but have not been tested.**

Usage
-----
Expand Down
2 changes: 0 additions & 2 deletions Setup.hs

This file was deleted.

1 change: 0 additions & 1 deletion core/Setup.hs

This file was deleted.

2 changes: 1 addition & 1 deletion core/grpc-haskell-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ test-suite tests
, proto3-suite
, transformers
, safe
, clock >=0.6.0 && <0.8.0
, clock >=0.6.0 && <0.9
, turtle >= 1.2.0
, text
, QuickCheck >=2.8 && <3.0
Expand Down
99 changes: 67 additions & 32 deletions examples/echo/echo-hs/Echo.hs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 30 additions & 21 deletions examples/tutorial/Arithmetic.hs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a068444

Please sign in to comment.