From 4792eb0199888f4103ce8b2935f0576cbc271582 Mon Sep 17 00:00:00 2001 From: Zolisa Bleki Date: Fri, 6 Sep 2024 03:06:17 +0200 Subject: [PATCH] Loosen Ocaml compiler version upper bound. --- .github/workflows/build-and-test.yml | 14 +++++++------- dune-project | 8 ++++---- zarr-eio.opam | 2 +- zarr-lwt.opam | 2 +- zarr-sync.opam | 2 +- zarr.opam | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ca495d5c..6256ff66 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.1.1" + - "5.2.0" - "4.14.2" local-packages: - zarr.opam @@ -48,7 +48,7 @@ jobs: opam exec -- dune build zarr zarr-sync zarr-lwt - name: setup ocaml-5-specific - if: ${{ matrix.ocaml-compiler == '5.1.1' }} + if: ${{ matrix.ocaml-compiler == '5.2.0' }} run: | opam install eio_main --yes opam exec -- dune build zarr-eio @@ -60,29 +60,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.1.1' }} + if: ${{ matrix.ocaml-compiler == '5.2.0' }} 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.1.1' }} + if: ${{ matrix.ocaml-compiler == '5.2.0' }} run: opam exec -- bisect-ppx-report send-to Codecov env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: Build Docs - if: ${{ matrix.ocaml-compiler == '5.1.1' }} + if: ${{ matrix.ocaml-compiler == '5.2.0' }} run: opam exec -- dune build @doc - name: Upload API Docs artifact - if: ${{ matrix.ocaml-compiler == '5.1.1' }} + if: ${{ matrix.ocaml-compiler == '5.2.0' }} uses: actions/upload-artifact@v3.1.3 with: name: docs path: ./_build/default/_doc/_html - name: Deploy API Docs - if: ${{ matrix.ocaml-compiler == '5.1.1' }} + if: ${{ matrix.ocaml-compiler == '5.2.0' }} uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/dune-project b/dune-project index 4a62ae63..bcbc1632 100644 --- a/dune-project +++ b/dune-project @@ -27,7 +27,7 @@ (depends dune (ocaml - (and (>= 4.14.0) (< 5.2.0))) + (and (>= 4.14.0))) (yojson (>= 1.6.0)) (ezgzip (>= 0.2.0)) (stdint (>= 0.7.2)) @@ -46,7 +46,7 @@ (depends dune (ocaml - (and (>= 4.14.0) (< 5.2.0))) + (and (>= 4.14.0))) (zarr (= :version)) (odoc :with-doc) (ounit2 :with-test) @@ -60,7 +60,7 @@ (depends dune (ocaml - (and (>= 4.14.0) (< 5.2.0))) + (and (>= 4.14.0))) (zarr (= :version)) (lwt (>= 2.5.1)) (odoc :with-doc) @@ -75,7 +75,7 @@ (depends dune (ocaml - (and (>= 5.1.0) (< 5.2.0))) + (and (>= 5.1.0))) (zarr (= :version)) (eio_main (>= 1.0)) (odoc :with-doc) diff --git a/zarr-eio.opam b/zarr-eio.opam index 023e16c3..9364a9ad 100644 --- a/zarr-eio.opam +++ b/zarr-eio.opam @@ -10,7 +10,7 @@ doc: "https://zoj613.github.io/zarr-ml" bug-reports: "https://github.com/zoj613/zarr-ml/issues" depends: [ "dune" {>= "3.15"} - "ocaml" {>= "5.1.0" & < "5.2.0"} + "ocaml" {>= "5.1.0"} "zarr" {= version} "eio_main" {>= "1.0"} "odoc" {with-doc} diff --git a/zarr-lwt.opam b/zarr-lwt.opam index e565304c..4e14ce44 100644 --- a/zarr-lwt.opam +++ b/zarr-lwt.opam @@ -10,7 +10,7 @@ doc: "https://zoj613.github.io/zarr-ml" bug-reports: "https://github.com/zoj613/zarr-ml/issues" depends: [ "dune" {>= "3.15"} - "ocaml" {>= "4.14.0" & < "5.2.0"} + "ocaml" {>= "4.14.0"} "zarr" {= version} "lwt" {>= "2.5.1"} "odoc" {with-doc} diff --git a/zarr-sync.opam b/zarr-sync.opam index 462ee1a2..0006d9af 100644 --- a/zarr-sync.opam +++ b/zarr-sync.opam @@ -10,7 +10,7 @@ doc: "https://zoj613.github.io/zarr-ml" bug-reports: "https://github.com/zoj613/zarr-ml/issues" depends: [ "dune" {>= "3.15"} - "ocaml" {>= "4.14.0" & < "5.2.0"} + "ocaml" {>= "4.14.0"} "zarr" {= version} "odoc" {with-doc} "ounit2" {with-test} diff --git a/zarr.opam b/zarr.opam index d0cf518b..7f49394d 100644 --- a/zarr.opam +++ b/zarr.opam @@ -15,7 +15,7 @@ doc: "https://zoj613.github.io/zarr-ml" bug-reports: "https://github.com/zoj613/zarr-ml/issues" depends: [ "dune" {>= "3.15"} - "ocaml" {>= "4.14.0" & < "5.2.0"} + "ocaml" {>= "4.14.0"} "yojson" {>= "1.6.0"} "ezgzip" {>= "0.2.0"} "stdint" {>= "0.7.2"}