Fix Cygwin git operation on Windows checkouts

.github/scripts/cygwin.cmd

@@ -105,6 +105,11 @@ set CYGWIN_PACKAGES=make,patch,curl,diffutils,tar,unzip,git,gcc-g++,libicu-devel
 :: up the call to ldd later!
 %CYGWIN_ROOT%\bin\bash -lc "uname -a"
 
+:: Mitigations added for CVE-2022-24765 cause error messages as the owner of the
+:: git checkout won't be correct. It simply doesn't matter on a CI system, so
+:: just add the directory to safe.directory to ignore it.
+%CYGWIN_ROOT%\bin\bash -c "git config --global --add safe.directory $PWD"
+
 echo ::endgroup::
 
 :: cygpath %CYGWIN_ROOT% will return / which isn't very helpful. Instead, call

.github/workflows/ci.ml

@@ -48,8 +48,7 @@ on:
     - '*.opam'
     - 'Makefile*'
     - 'configure*'
-    - '.github/scripts/main/**'
-    - '.github/scripts/common/**'
+    - '.github/scripts/**'
     - '.github/workflows/main.yml'
     - 'tests/**'
 #    paths-ignore:

.github/workflows/main.yml

@@ -21,8 +21,7 @@ on:
     - '*.opam'
     - 'Makefile*'
     - 'configure*'
-    - '.github/scripts/main/**'
-    - '.github/scripts/common/**'
+    - '.github/scripts/**'
     - '.github/workflows/main.yml'
     - 'tests/**'
 #    paths-ignore:

master_changes.md

@@ -158,6 +158,7 @@ users)
 ## Infrastructure
   * Fix caching of Cygwin compiler on AppVeyor [#4988 @dra27]
   * Small update to GHA scripts [#5055 @dra27]
+  * Adapt Windows CI to new safe.directory setting [#5119 @dra27]
 
 ## Admin
   * ✘ `opam admin cache` now ignores all already present cache files. Option