From 8d0bd88cc375dc5df6c7bc216aae04ba93e4f4eb Mon Sep 17 00:00:00 2001 From: Anton Bachin Date: Wed, 21 Aug 2024 11:20:05 +0300 Subject: [PATCH 1/2] CI: test only on OCaml 4.13 and higher Dream no longer installs on lower OCaml versions, because mirage-crypto requires OCaml 4.13. See https://github.com/mirage/mirage-crypto/pull/233 The reason for mirage-crypto requiring 4.13 seems to be minor convenience, and isn't justified in my opinion. However, Dream itself will likely require OCaml 5 in the medium term due to upgrading to multicore and effects, so it seems unnecessary to make an effort to restore 4.08 support at this point. --- .github/workflows/test.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a53de3f..d8982332 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,14 +12,9 @@ jobs: - 5.0.x - 4.14.x - 4.13.x - - 4.12.x - - 4.11.x - - 4.10.x - - 4.09.x - - 4.08.x include: - os: macos-latest - ocaml: 4.12.x + ocaml: 4.14.x - os: windows-latest ocaml: 4.14.x From c9db203d901e07efc5d592207674659e30024b8b Mon Sep 17 00:00:00 2001 From: Anton Bachin Date: Wed, 21 Aug 2024 12:02:15 +0300 Subject: [PATCH 2/2] Exclude dream-mirage.opam from main CI dream-mirage has additional dependencies that may be slower to update, or otherwise cause package conflicts. It's only needed for the mirage test, not for the main test suite of Dream. --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8982332..2585a77d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,14 +24,16 @@ jobs: with: submodules: recursive - - uses: avsm/setup-ocaml@v2 + - uses: avsm/setup-ocaml@v3 if: runner.os != 'Windows' with: + opam-local-packages: dream-pure.opam dream-httpaf.opam dream.opam ocaml-compiler: ${{matrix.ocaml}} - - uses: avsm/setup-ocaml@v2 + - uses: avsm/setup-ocaml@v3 if: runner.os == 'Windows' with: + opam-local-packages: dream-pure.opam dream-httpaf.opam dream.opam ocaml-compiler: ${{matrix.ocaml}} opam-repositories: | opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset