diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5f01af2..c3b28f8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -24,7 +24,7 @@ jobs: os: - ubuntu-latest ocaml-compiler: - - "5.2.0" + - "5.2.1" - "4.14.2" local-packages: - zarr.opam @@ -72,14 +72,14 @@ jobs: - name: setup run: | opam install --deps-only --with-test --with-doc --yes zarr - opam install bytesrw conf-zlib conf-zstd --yes - opam install lwt aws-s3-lwt --yes + opam install --deps-only --with-test --with-doc --yes zarr-sync + opam install --deps-only --with-test --with-doc --yes zarr-lwt opam exec -- dune build zarr zarr-sync zarr-lwt - name: setup ocaml-5-specific - if: ${{ matrix.ocaml-compiler == '5.2.0' }} + if: ${{ matrix.ocaml-compiler == '5.2.1' }} run: | - opam install eio_main --yes + opam install --deps-only --with-test --with-doc --yes zarr-eio opam exec -- dune build zarr-eio - name: test @@ -89,29 +89,29 @@ jobs: opam exec -- dune exec --instrument-with bisect_ppx --force -- _build/default/zarr-lwt/test/test_lwt.exe -runner sequential -ci true - name: test ocaml-5-specific libs - if: ${{ matrix.ocaml-compiler == '5.2.0' }} + if: ${{ matrix.ocaml-compiler == '5.2.1' }} run: | opam exec -- dune exec --instrument-with bisect_ppx --force -- _build/default/zarr-eio/test/test_eio.exe -runner sequential -ci true - name: Upload code coverage report - if: ${{ matrix.ocaml-compiler == '5.2.0' }} + if: ${{ matrix.ocaml-compiler == '5.2.1' }} run: opam exec -- bisect-ppx-report send-to Codecov env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: Build Docs - if: ${{ matrix.ocaml-compiler == '5.2.0' }} + if: ${{ matrix.ocaml-compiler == '5.2.1' }} run: opam exec -- dune build @doc - name: Upload API Docs artifact - if: ${{ matrix.ocaml-compiler == '5.2.0' }} + if: ${{ matrix.ocaml-compiler == '5.2.1' }} uses: actions/upload-artifact@v3.1.3 with: name: docs path: ./_build/default/_doc/_html - name: Deploy API Docs - if: ${{ matrix.ocaml-compiler == '5.2.0' }} + if: ${{ matrix.ocaml-compiler == '5.2.1' }} uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/dune-project b/dune-project index 3c34f93..636c7c4 100644 --- a/dune-project +++ b/dune-project @@ -32,6 +32,7 @@ (stdint (>= 0.7.2)) (zipc (>= 0.2.0)) (checkseum (>= 0.4.0)) + (bytesrw (>= 0.1.0)) (odoc :with-doc) (ounit2 :with-test) (ppx_deriving :with-test) @@ -66,8 +67,10 @@ (zarr (= :version)) (lwt (>= 2.5.1)) (aws-s3-lwt (>= 4.8.1)) + (cohttp-lwt (>= 6.0.0)) (odoc :with-doc) (ounit2 :with-test) + (tiny_httpd :with-test) (ppx_deriving :with-test) (bisect_ppx (and :dev (>= 2.5.0) :with-test)))) @@ -84,6 +87,7 @@ (cohttp-eio (>= 6.0.0)) (odoc :with-doc) (ounit2 :with-test) + (tiny_httpd :with-test) (ppx_deriving :with-test) (bisect_ppx (and :dev (>= 2.5.0) :with-test)))) diff --git a/zarr-eio.opam b/zarr-eio.opam index f1601ca..d311a52 100644 --- a/zarr-eio.opam +++ b/zarr-eio.opam @@ -16,6 +16,7 @@ depends: [ "cohttp-eio" {>= "6.0.0"} "odoc" {with-doc} "ounit2" {with-test} + "tiny_httpd" {with-test} "ppx_deriving" {with-test} "bisect_ppx" {dev & >= "2.5.0" & with-test} ] diff --git a/zarr-lwt.opam b/zarr-lwt.opam index f5e43a4..2d8b1b1 100644 --- a/zarr-lwt.opam +++ b/zarr-lwt.opam @@ -14,8 +14,10 @@ depends: [ "zarr" {= version} "lwt" {>= "2.5.1"} "aws-s3-lwt" {>= "4.8.1"} + "cohttp-lwt" {>= "6.0.0"} "odoc" {with-doc} "ounit2" {with-test} + "tiny_httpd" {with-test} "ppx_deriving" {with-test} "bisect_ppx" {dev & >= "2.5.0" & with-test} ] diff --git a/zarr.opam b/zarr.opam index b70d30c..587af32 100644 --- a/zarr.opam +++ b/zarr.opam @@ -20,6 +20,7 @@ depends: [ "stdint" {>= "0.7.2"} "zipc" {>= "0.2.0"} "checkseum" {>= "0.4.0"} + "bytesrw" {>= "0.1.0"} "odoc" {with-doc} "ounit2" {with-test} "ppx_deriving" {with-test} @@ -40,6 +41,3 @@ build: [ ] ] dev-repo: "git+https://github.com/zoj613/zarr-ml.git" -pin-depends: [ - ["bytesrw.dev" "git+https://erratique.ch/repos/bytesrw.git"] -] diff --git a/zarr.opam.template b/zarr.opam.template deleted file mode 100644 index 4e82fcf..0000000 --- a/zarr.opam.template +++ /dev/null @@ -1,3 +0,0 @@ -pin-depends: [ - ["bytesrw.dev" "git+https://erratique.ch/repos/bytesrw.git"] -]