From 4b0ff6b291649be6dfb5611468b6e0249b31e15d Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Mon, 30 Oct 2023 09:34:59 +0000 Subject: [PATCH 1/3] Allow pre-released opam to workaround --strict --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abc03c9..e8437cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: ${{ matrix.ocaml-version }} + allow-prelease-opam: true # Dune (may fail with trunk) - name: Install dune, if possible From 4ddb578516a1ef23bf8d1f7e401603e5dfbc0938 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Mon, 30 Oct 2023 15:09:05 +0000 Subject: [PATCH 2/3] "trunk" is now OCaml 5.2 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8437cb..f4fdc37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: - 4.06.x - 4.14.x - 5.0.x - - ocaml-variants.5.1.0+trunk + - ocaml-variants.5.2.0+trunk exclude: - os: windows-latest - ocaml-version: ocaml-variants.5.1.0+trunk + ocaml-version: ocaml-variants.5.2.0+trunk - os: windows-latest ocaml-version: 5.0.x From 33ddd78554f1108e02f8afac064fc116affbf3a4 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Mon, 30 Oct 2023 15:10:16 +0000 Subject: [PATCH 3/3] Test 5.1.x instead of 5.0.x --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4fdc37..611daea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,13 +16,13 @@ jobs: ocaml-version: - 4.06.x - 4.14.x - - 5.0.x + - 5.1.x - ocaml-variants.5.2.0+trunk exclude: - os: windows-latest ocaml-version: ocaml-variants.5.2.0+trunk - os: windows-latest - ocaml-version: 5.0.x + ocaml-version: 5.1.x runs-on: ${{ matrix.os }}