From 4e4d1bc75201c75a91277104fc387a036c43d896 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 22 May 2024 11:40:05 -0400 Subject: [PATCH] fix --- .github/workflows/main.yml | 34 +++++++++++++++++++++++++--------- linol-eio.opam | 2 +- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 820044ab..2339457b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,17 +5,13 @@ on: - main pull_request: jobs: - run: - name: Build + build4: strategy: matrix: os: - ubuntu-latest - #- macos-latest - #- windows-latest ocaml-compiler: - 4.14.x - - 5.1.x runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@main @@ -26,10 +22,30 @@ jobs: allow-prerelease-opam: true - run: opam pin -n . - run: opam depext -yt linol linol-lwt + - run: opam install linol linol-lwt --deps-only -t + - run: opam exec -- dune build -p linol,linol-lwt + - run: opam exec -- dune runtest -p linol,linol-lwt + if: ${{ matrix.os == 'ubuntu-latest' }} + build5: + strategy: + matrix: + os: + - ubuntu-latest + #- macos-latest + #- windows-latest + ocaml-compiler: + - 5.1.x + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@main + - uses: ocaml/setup-ocaml@v2 + with: + ocaml-compiler: ${{ matrix.ocaml-compiler }} + dune-cache: true + allow-prerelease-opam: true + - run: opam pin -n . + - run: opam depext -yt linol linol-lwt linol-eio - run: opam install -t . --deps-only - run: opam exec -- dune build - if: ${{ matrix.ocaml-compiler == '5.1.x' }} - - run: opam exec -- dune build -p linol,linol-lwt - if: ${{ matrix.ocaml-compiler == '4.14.x' }} - run: opam exec -- dune runtest - if: ${{ matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.1.x' }} + if: ${{ matrix.os == 'ubuntu-latest' }} diff --git a/linol-eio.opam b/linol-eio.opam index be6c986a..4b9f0d60 100644 --- a/linol-eio.opam +++ b/linol-eio.opam @@ -11,7 +11,7 @@ depends: [ "yojson" {>= "1.6"} "linol" {= version} "base-unix" - "eio" {>= "1.0" & < "1.0"} + "eio" {>= "1.0" & < "2.0"} "lsp" {>= "1.17" & < "1.18"} "jsonrpc" {>= "1.17" & < "1.18"} "odoc" {with-doc}