From a8d692c6a796d718c4ee10ca868d599078b8e492 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 1 May 2024 19:10:58 +0200 Subject: [PATCH 1/2] Fix compiler warning --- analysis/vendor/res_syntax/jsx_v4.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/vendor/res_syntax/jsx_v4.ml b/analysis/vendor/res_syntax/jsx_v4.ml index 4524ca459..2fb74c8cc 100644 --- a/analysis/vendor/res_syntax/jsx_v4.ml +++ b/analysis/vendor/res_syntax/jsx_v4.ml @@ -1,4 +1,4 @@ -open Ast_helper +open! Ast_helper open Ast_mapper open Asttypes open Parsetree From b587b9f9206b59bfdd16f2d316e82bb46f4ef880 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 1 May 2024 19:25:42 +0200 Subject: [PATCH 2/2] Build with OCaml 5.1.1 --- .github/workflows/ci.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7cf3b9d5..0fe4b070a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,8 +55,23 @@ jobs: - name: Use OCaml uses: ocaml/setup-ocaml@v2 + if: matrix.os != 'windows-latest' with: - ocaml-compiler: 4.14.x + ocaml-compiler: 5.1.1 + opam-pin: false + opam-depext: false + + - name: Use OCaml (Windows) + uses: ocaml/setup-ocaml@v2 + if: matrix.os == 'windows-latest' + with: + ocaml-compiler: ocaml-variants.5.1.1+options,ocaml-option-mingw + opam-pin: false + opam-depext: false + opam-repositories: | + windows-5.0: https://github.com/dra27/opam-repository.git#windows-5.0 + sunset: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset + default: https://github.com/ocaml/opam-repository.git - name: Use Node.js uses: actions/setup-node@v4