Revised windows init

.github/workflows/ci.ml

@@ -476,8 +476,8 @@ let main oc : unit =
     ("OPAM12CACHE", "~/.cache/opam1.2/cache");
     (* These should be identical to the values in appveyor.yml *)
     ("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
-    ("OPAM_TEST_REPO_SHA", "c61e9068d528d92b1d6ac84a06cf44489b10b835");
-    ("OPAM_REPO_SHA", "c61e9068d528d92b1d6ac84a06cf44489b10b835");
+    ("OPAM_TEST_REPO_SHA", "dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a");
+    ("OPAM_REPO_SHA", "dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a");
     ("SOLVER", "");
     (* Cygwin configuration *)
     ("CYGWIN_MIRROR", "http://mirrors.kernel.org/sourceware/cygwin/");

.github/workflows/depexts.yml

@@ -18,7 +18,7 @@ defaults:
 env:
   OPAMVERSION: 2.1.0
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
+  OPAM_REPO_SHA: dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a
 
 jobs:
   opam-cache:

.github/workflows/main.yml

@@ -26,8 +26,8 @@ env:
   OPAMBSROOT: ~/.cache/.opam.cached
   OPAM12CACHE: ~/.cache/opam1.2/cache
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_TEST_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
-  OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
+  OPAM_TEST_REPO_SHA: dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a
+  OPAM_REPO_SHA: dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a
   SOLVER:
   CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
   CYGWIN_ROOT: D:\cygwin

master_changes.md

@@ -80,13 +80,15 @@ users)
   * [BUG] Fix `x-env-path-rewrite` splitting of values when reverting [#5935 @dra27 - fix #5838]
   * [BUG] Rework the logic of := and =: so that an empty entry is correctly preserved on multiple updates [#5935 @dra27 - fix #5926]
   * [BUG] Fix incorrect reverting of `=+` and `=:` [#5935 @dra27 - fix #5926]
+  * For the `Cygwin` internal operator, don't allow `make.exe` to become shadowed [#5996 @dra27]
 
 ## Opamfile
 
 ## External dependencies
   * Pass --symlink-type native to Cygwin setup if symlinks are available [#5830 @dra27]
   * Pass --no-version-check to Cygwin setup (suppresses a message box if setup needs updating) [#5830 @dra27]
   * Pass --quiet-mode noinput to stop the user interrupting the setup GUI [#5830 @dra27]
+  * Always pass --no-write-registry to the Cygwin installer, not just on first installation [#5995 @dra27]
 
 ## Format upgrade
   * Handle init OCaml `sys-ocaml-*` eval variables during format upgrade from 2.0 -> 2.1 -> 2.2 [#5829 @dra27]
@@ -102,6 +104,7 @@ users)
 
 ## Infrastructure
   * Ensure GNU coreutils available on the macOS 14 CI runners [#5938 @dra27]
+  * Update the opam-repository testing sha to include the new compiler packages in opam-repository [#5998 @dra27]
 
 ## Release scripts
   * Upgrade the OCaml compiler used for releases to 4.14.2 [#5976 @kit-ty-kate]
@@ -127,6 +130,7 @@ users)
 
 ## Internal: Windows
   * Set the console to use UTF-8 on Windows using SetConsoleCP and SetConsoleOutputCP [#5970 @kit-ty-kate]
+  * Harden the CRLF stripping when using cygcheck [#5993 @dra27]
 
 ## Test
 

src/client/opamAction.ml

@@ -528,9 +528,8 @@ let compilation_env t opam =
       (OpamFile.OPAM.build_env opam)
   in
   let cygwin_env =
-    match OpamSysInteract.Cygwin.cygbin_opt t.switch_global.config with
+    match OpamCoreConfig.(!r.cygbin) with
     | Some cygbin ->
-      let cygbin = OpamFilename.Dir.to_string cygbin in
       [ OpamTypesBase.env_update_resolved "PATH" Cygwin cygbin
           ~comment:"Cygwin path"
       ] @ (match OpamCoreConfig.(!r.git_location) with