From 64f292908dde4c704d8f2ace20e06001097be9ca Mon Sep 17 00:00:00 2001 From: enoumy Date: Sun, 5 Jan 2025 10:04:39 -0500 Subject: [PATCH] Update ppx_yojson version + update the build-lint jobs to use with-extensions branch --- .github/workflows/blank.yml | 8 ++++++++ capy.opam | 2 +- dune-project | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index b47e8ed..be73b03 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -56,6 +56,10 @@ jobs: with: ocaml-compiler: "5.1" + - run: opam switch create 5.2.0+flambda2 --repos with-extensions=git+https://github.com/janestreet/opam-repository.git#with-extensions,default + + - run: bash -c "eval $(opam env --switch 5.2.0+flambda2)" + - uses: ocaml/setup-ocaml/lint-doc@v3 lint-fmt: @@ -69,4 +73,8 @@ jobs: with: ocaml-compiler: "5.1" + - run: opam switch create 5.2.0+flambda2 --repos with-extensions=git+https://github.com/janestreet/opam-repository.git#with-extensions,default + + - run: bash -c "eval $(opam env --switch 5.2.0+flambda2)" + - uses: ocaml/setup-ocaml/lint-fmt@v3 diff --git a/capy.opam b/capy.opam index d897ae8..6ee2970 100644 --- a/capy.opam +++ b/capy.opam @@ -14,7 +14,7 @@ depends: [ "dune" {>= "3.9"} "notty" "yojson" {= "2.2.2"} - "ppx_yojson_conv" {= "v0.18~preview.130.04+450"} + "ppx_yojson_conv" "bonsai" {= "v0.18~preview.130.04+450"} "bonsai_test" {= "v0.18~preview.130.04+450"} "async_ssl" {= "v0.18~preview.130.04+450"} diff --git a/dune-project b/dune-project index 86cec7c..c364c40 100644 --- a/dune-project +++ b/dune-project @@ -26,8 +26,7 @@ notty (yojson (= "2.2.2")) - (ppx_yojson_conv - (= "v0.18~preview.130.04+450")) + ppx_yojson_conv (bonsai (= "v0.18~preview.130.04+450")) (bonsai_test