Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OCaml versions on windows #62

Merged
merged 2 commits into from
Aug 8, 2024
Merged

Update OCaml versions on windows #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7bb94b
Update windows.yml
tmcgilchrist Jul 29, 2024
e21cf67
Update async version and fix deprecation messages.
tmcgilchrist Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
- windows-latest
ocaml-compiler:
- "ocaml.5.0.0,ocaml-option-mingw"
- "ocaml.5.1.0,ocaml-option-mingw"
- "ocaml.5.1.1,ocaml-option-mingw"
- "ocaml.5.2.0,ocaml-option-mingw"

runs-on: ${{ matrix.os }}

Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Unreleased
- Fix bug in Grpc-lwt-client to fetch status code from response header ([#58](https://github.com/dialohq/ocaml-grpc/pull/58)) ([acerone85](https://github.com/acerone85)) review by ([@quernd](https://github.com/quernd))
- Update Async dependency to v0.17.0 ([#62](https://github.com/dialohq/ocaml-grpc/pull/62) ([@tmcgilchrist](https://github.com/tmcgilchrist))

## 0.2.0 2023-10-23

Expand Down
4 changes: 2 additions & 2 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
(ocaml
(>= 4.11))
(async
(>= v0.16))
(>= v0.17))
(grpc
(= :version))
(h2
Expand Down Expand Up @@ -100,7 +100,7 @@
(network rpc serialisation))
(depends
(async
(>= v0.16.0))
(>= v0.17.0))
cohttp
cohttp-lwt
cohttp-lwt-unix
Expand Down
2 changes: 1 addition & 1 deletion grpc-async.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"ocaml" {>= "4.11"}
"async" {>= "v0.16"}
"async" {>= "v0.17"}
"grpc" {= version}
"h2" {>= "0.9.0"}
"ppx_jane" {>= "v0.16.0"}
Expand Down
2 changes: 1 addition & 1 deletion grpc-examples.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ doc: "https://dialohq.github.io/ocaml-grpc"
bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"async" {>= "v0.16.0"}
"async" {>= "v0.17.0"}
"cohttp"
"cohttp-lwt"
"cohttp-lwt-unix"
Expand Down
6 changes: 3 additions & 3 deletions lib/grpc-async/client.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ let default_headers =
[ ("te", "trailers"); ("content-type", "application/grpc+proto") ]

let trailers_handler trailers_status_ivar headers =
Ivar.fill trailers_status_ivar (Grpc.Status.extract_status headers)
Async.Ivar.fill_exn trailers_status_ivar (Grpc.Status.extract_status headers)

let response_handler read_body_ivar out_ivar (response : H2.Response.t)
(body : H2.Body.Reader.t) =
Ivar.fill read_body_ivar body;
Ivar.fill out_ivar response
Async.Ivar.fill_exn read_body_ivar body;
Async.Ivar.fill_exn out_ivar response

let call ~service ~rpc ?(scheme = "https") ~handler ~do_request
?(headers = default_headers) () =
Expand Down
Loading