From 4b90160720461335e686c3ba6b889cf41a8a3990 Mon Sep 17 00:00:00 2001 From: Kate Date: Tue, 12 Mar 2024 15:57:46 +0000 Subject: [PATCH 1/2] Allow to compile opam when the environment contains unicode characters on Windows (upgrade to dune 3.14.2) --- master_changes.md | 2 ++ src_ext/Makefile.dune | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/master_changes.md b/master_changes.md index 3b5fc87542b..3bcf85b580a 100644 --- a/master_changes.md +++ b/master_changes.md @@ -89,6 +89,8 @@ users) * Upgrade the vendored re to 1.11.0 [#5869 @dra27] * Upgrade the vendored ocamlgraph to 2.1.0 [#5869 @dra27] * Upgrade the vendored opam-file-format to 2.1.6 [#5869 @dra27] + * Allow to compile opam when the environment contains unicode characters on Windows [#5880 @kit-ty-kate] + * Upgrade the vendored dune to 3.14.2 [#5880 @kit-ty-kate] ## Infrastructure * Fix depexts CI workflow and ensure all workflows run on master push [#5788 @dra27] diff --git a/src_ext/Makefile.dune b/src_ext/Makefile.dune index d1e43cc3854..1267c104a42 100644 --- a/src_ext/Makefile.dune +++ b/src_ext/Makefile.dune @@ -1,3 +1,3 @@ # NB If minimum OCaml version for Dune changes, update DUNE_SECONDARY in configure.ac -URL_dune-local = https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz -MD5_dune-local = bff778fff4996b890e5af3da7ecf5baa +URL_dune-local = https://github.com/ocaml/dune/releases/download/3.14.2/dune-3.14.2.tbz +MD5_dune-local = 9496e02635c05a8288781b55fb837b6f From d23b77d50bc4fc6e3b3a9f9d5a9b131459a5b142 Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 15 Mar 2024 15:22:24 +0000 Subject: [PATCH 2/2] Update master_changes.md Co-authored-by: R. Boujbel --- master_changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master_changes.md b/master_changes.md index 3bcf85b580a..9de1717bc01 100644 --- a/master_changes.md +++ b/master_changes.md @@ -89,7 +89,7 @@ users) * Upgrade the vendored re to 1.11.0 [#5869 @dra27] * Upgrade the vendored ocamlgraph to 2.1.0 [#5869 @dra27] * Upgrade the vendored opam-file-format to 2.1.6 [#5869 @dra27] - * Allow to compile opam when the environment contains unicode characters on Windows [#5880 @kit-ty-kate] + * Allow to compile opam when the environment contains unicode characters on Windows [#5880 @kit-ty-kate - fix #5861] * Upgrade the vendored dune to 3.14.2 [#5880 @kit-ty-kate] ## Infrastructure