Skip to content

Commit a068444

Browse files
authored
Upgrade to grpc-1.42.0 (#152)
- 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.
1 parent 53614aa commit a068444

23 files changed

+360
-251
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
build-linux:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3.0.2
11+
- uses: actions/checkout@v3.5.3
1212
name: Checkout
13-
- uses: cachix/install-nix-action@v20
13+
- uses: cachix/install-nix-action@v21
1414
name: Install Nix
1515
- uses: cachix/cachix-action@v12
1616
name: Set up Cachix
@@ -21,9 +21,9 @@ jobs:
2121
build-macos:
2222
runs-on: macos-latest
2323
steps:
24-
- uses: actions/checkout@v3.0.2
24+
- uses: actions/checkout@v3.5.3
2525
name: Checkout
26-
- uses: cachix/install-nix-action@v20
26+
- uses: cachix/install-nix-action@v21
2727
name: Install Nix
2828
- uses: cachix/cachix-action@v12
2929
name: Set up Cachix

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ have extended and released under the same [`LICENSE`](./LICENSE)
77
Installation
88
------------
99

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

1212
Usage
1313
-----

Setup.hs

Lines changed: 0 additions & 2 deletions
This file was deleted.

core/Setup.hs

Lines changed: 0 additions & 1 deletion
This file was deleted.

core/grpc-haskell-core.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ test-suite tests
9696
, proto3-suite
9797
, transformers
9898
, safe
99-
, clock >=0.6.0 && <0.8.0
99+
, clock >=0.6.0 && <0.9
100100
, turtle >= 1.2.0
101101
, text
102102
, QuickCheck >=2.8 && <3.0

examples/echo/echo-hs/Echo.hs

Lines changed: 67 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/tutorial/Arithmetic.hs

Lines changed: 30 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)