Skip to content

Commit

Permalink
Merge pull request #311 from dinosaure/3.0.0
Browse files Browse the repository at this point in the history
3.0.0
  • Loading branch information
avsm authored Sep 29, 2020
2 parents e586e05 + 5e0a0b4 commit 66fd34a
Show file tree
Hide file tree
Showing 152 changed files with 6,111 additions and 4,676 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,27 @@ jobs:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
ocaml-version: [ '4.08.1', '4.09.0', '4.10.0' ]
operating-system: [macos-latest, ubuntu-latest, windows-latest]
ocaml-version: [ '4.08.1', '4.09.0', '4.10.0', '4.11.1' ]
operating-system: [ ubuntu-latest ]
steps:
- uses: actions/checkout@master
- uses: avsm/setup-ocaml@master
- uses: actions/checkout@v2
- uses: avsm/setup-ocaml@v1
with:
ocaml-version: ${{ matrix.ocaml-version }}
- name: Deps
run: |
opam pin add -n conduit.dev .
opam pin add -n conduit-lwt.dev .
opam pin add -n conduit-lwt-unix.dev .
opam pin add -n conduit-async.dev .
opam pin add -n conduit-mirage.dev .
opam depext -y conduit conduit-lwt conduit-lwt-unix conduit-async conduit-mirage
opam install --deps-only .
opam pin add -n conduit-tls.dev .
opam pin add -n conduit-async-tls.dev .
opam pin add -n conduit-async-ssl.dev .
opam pin add -n conduit-lwt-tls.dev .
opam pin add -n conduit-lwt-ssl.dev .
opam depext -y conduit conduit-tls conduit-lwt conduit-async conduit-mirage
opam install --deps-only -t conduit conduit-tls conduit-lwt conduit-lwt-tls conduit-lwt-ssl conduit-async conduit-async-tls conduit-async-ssl conduit-mirage
- name: Build
run: opam exec -- dune build
- name: Test
run: opam exec -- dune runtest
run: opam exec -- dune runtest --no-buffer --verbose -j 1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ _opam/
.*.swp
*.install
.merlin
*~
9 changes: 9 additions & 0 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version = 0.15.0
break-infix = fit-or-vertical
parse-docstrings = true
indicate-multiline-delimiters=no
nested-match=align
sequence-style=separator
break-before-in=auto
if-then-else=keyword-first
parse-docstrings=false
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

23 changes: 0 additions & 23 deletions async/conduit_async.ml

This file was deleted.

23 changes: 0 additions & 23 deletions async/dune

This file was deleted.

65 changes: 0 additions & 65 deletions async/private_ssl_dummy.ml

This file was deleted.

Loading

0 comments on commit 66fd34a

Please sign in to comment.