From 09c1b478939112a2025bda1ccd05f7c3780bea9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Fri, 10 Jan 2025 17:17:15 +0100 Subject: [PATCH 1/2] Update changelog --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 38911ca38..7ad788faa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,6 @@ -unreleased +merlin 5.4 ========== +Fri Jan 10 17:55:42 CET 2025 + merlin binary - Support for OCaml 5.3 From 52589f0be8d6129af04f56ba9a50282e6194e8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Fri, 10 Jan 2025 15:23:15 +0100 Subject: [PATCH 2/2] Update compiler version in CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f6f60a85..2cd4698fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: - ubuntu-latest - windows-latest ocaml-compiler: - - ocaml-base-compiler.5.3.0~beta2 + - ocaml-base-compiler.5.3.0 # The type of runner that the job will run on runs-on: ${{ matrix.os }}