Skip to content

Commit

Permalink
fixup: CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
samoht committed Jan 29, 2021
1 parent 26c0a0a commit f7194fc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 15 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ jobs:
- run: |
opam pin add cohttp-async.dev . --no-action
opam pin add cohttp-lwt-jsoo.dev . --no-action
opam pin add cohttp-lwt-unix-nossl.dev . --no-action
opam pin add cohttp-lwt-unix-ssl.dev . --no-action
opam pin add cohttp-lwt-unix.dev . --no-action
opam pin add cohttp-lwt.dev . --no-action
opam pin add cohttp-mirage.dev . --no-action
Expand All @@ -50,8 +48,6 @@ jobs:
cohttp-lwt \
cohttp-lwt-jsoo \
cohttp-lwt-unix \
cohttp-lwt-unix-nossl \
cohttp-lwt-unix-ssl \
cohttp-mirage \
cohttp-top \
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,7 @@ findlib (`ocamlfind`) libraries:
* `cohttp` - Base `Cohttp` module. No platform specific functionality
* `cohttp-async` - Async backend `Cohttp_async`
* `cohttp-lwt` - Lwt backend without unix specifics
* `cohttp-lwt-unix` - Unix based lwt backend with `tls` support
* `cohttp-lwt-unix-ssl` - Unix based lwt backend with `lwt_ssl` support
* `cohttp-lwt-unix-nossl` - Unix based lwt backend (only `http`)
* `cohttp-lwt-unix` - Unix based lwt backend
* `cohttp-lwt-jsoo` - Jsoo (XHR) client
* `cohttp-top` - Print cohttp types in the toplevel (`#require "cohttp-top"`)

Expand All @@ -160,7 +158,7 @@ You can use [`Lwt.pick`](https://ocsigen.org/lwt/4.1.0/api/Lwt) to set a timeout
on the execution of a thread. For example, say that you want to set a timeout on
the `Client.get` thread in the example above, then you could modify the get call
as follows

```ocaml
(* [...] *)
Expand Down Expand Up @@ -247,7 +245,7 @@ To build and execute with `dune`, first create the following `dune` file
```
cat - > dune <<EOF
(executable
;(public_name docker_example)
;(public_name docker_example)
(name docker_example)
(libraries cohttp-lwt-unix conduit-lwt))
EOF
Expand All @@ -256,7 +254,7 @@ then run the example with
```
dune exec ./docker_example.exe
```
Even though conduit is transitively there, for this example we are explicitly
Even though conduit is transitively there, for this example we are explicitly
mentioning it to emphasize that we are creating a new Conduit resolver. Refer to
[conduit's README](https://github.com/mirage/ocaml-conduit/) for examples of use and
links to up-to-date conduit documentation.
Expand Down
1 change: 0 additions & 1 deletion cohttp-async.opam
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ depends: [
"core" {with-test}
"cohttp" {=version}
"conduit-async" {>="3.0.0"}
"conduit-async-ssl"
"magic-mime"
"mirage-crypto" {with-test}
"logs"
Expand Down
5 changes: 1 addition & 4 deletions cohttp-lwt-unix.opam
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
depends: [
"ocaml" {>= "4.08"}
"dune" {>= "1.1.0"}
"conduit-lwt" {>= "3.0.0"}
"conduit-lwt-tls"
"ca-certs"
"conduit-lwt-unix" {>= "1.0.3"}
"cmdliner"
"magic-mime"
"logs"
"fmt" {>= "0.8.2"}
"cohttp-lwt" {=version}
"cohttp-lwt-unix-nossl" {=version}
"ppx_sexp_conv" {>= "v0.13.0"}
"lwt" {>= "3.0.0"}
"base-unix"
Expand Down

0 comments on commit f7194fc

Please sign in to comment.