From e481c48fe5ada78294e08d99c158cbd308044688 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 4 Dec 2024 11:04:44 -0500 Subject: [PATCH] relax bound on picos to 0.5-0.6 --- .github/workflows/gh-pages.yml | 2 +- .github/workflows/main.yml | 3 +-- dune-project | 6 +++--- moonpool-io.opam | 2 +- moonpool.opam | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 20d74435..089b9e2a 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -20,7 +20,7 @@ jobs: allow-prerelease-opam: true # temporary until it's in a release - - run: opam pin https://github.com/ocaml-multicore/picos.git -y -n + - run: opam pin picos 0.6 -y -n - run: opam install odig moonpool moonpool-lwt moonpool-io diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a16fe420..4947cdbf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,8 +29,7 @@ jobs: dune-cache: true allow-prerelease-opam: true - # temporary until it's in a release - - run: opam pin https://github.com/ocaml-multicore/picos.git -y -n + - run: opam pin picos 0.6 -y -n - run: opam install -t moonpool moonpool-lwt moonpool-io --deps-only if: matrix.ocaml-compiler == '5.2' diff --git a/dune-project b/dune-project index 3c5eef8f..260d3274 100644 --- a/dune-project +++ b/dune-project @@ -25,8 +25,8 @@ (thread-local-storage (and (>= 0.2) (< 0.3))) (odoc :with-doc) (hmap :with-test) - (picos (and (>= 0.5) (< 0.6))) - (picos_std (and (>= 0.5) (< 0.6))) + (picos (and (>= 0.5) (< 0.7))) + (picos_std (and (>= 0.5) (< 0.7))) (mdx (and (>= 1.9.0) @@ -56,7 +56,7 @@ (allow_empty) ; on < 5.0 (depends (moonpool (= :version)) - (picos_io (and (>= 0.5) (< 0.6))) + (picos_io (and (>= 0.5) (< 0.7))) (ocaml (>= 5.0)) (trace :with-test) (trace-tef :with-test) diff --git a/moonpool-io.opam b/moonpool-io.opam index 9bcbc301..10c41c86 100644 --- a/moonpool-io.opam +++ b/moonpool-io.opam @@ -10,7 +10,7 @@ bug-reports: "https://github.com/c-cube/moonpool/issues" depends: [ "dune" {>= "3.0"} "moonpool" {= version} - "picos_io" {>= "0.5" & < "0.6"} + "picos_io" {>= "0.5" & < "0.7"} "ocaml" {>= "5.0"} "trace" {with-test} "trace-tef" {with-test} diff --git a/moonpool.opam b/moonpool.opam index 7f377fd0..97b8cf67 100644 --- a/moonpool.opam +++ b/moonpool.opam @@ -18,8 +18,8 @@ depends: [ "thread-local-storage" {>= "0.2" & < "0.3"} "odoc" {with-doc} "hmap" {with-test} - "picos" {>= "0.5" & < "0.6"} - "picos_std" {>= "0.5" & < "0.6"} + "picos" {>= "0.5" & < "0.7"} + "picos_std" {>= "0.5" & < "0.7"} "mdx" {>= "1.9.0" & with-test} ] depopts: [