Merge pull request #4942 from kit-ty-kate/backport-4927-2.1

Backport #4927 on 2.1

.github/workflows/ci.yml

@@ -7,8 +7,8 @@ env:
   OPAMBSROOT: ~/.cache/.opam.cached
   OPAM12CACHE: ~/.cache/opam1.2/cache
   # This should be identical to the value in appveyor.yml
-  OPAM_TEST_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
-  OPAM_REPO_SHA: 9355b17f9c22a2b44740e3fc5f25f24771929f26
+  OPAM_TEST_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
+  OPAM_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
   # Default ocaml version for some jobs
   OCAML_VERSION: 4.12.0
   ## variables for cache paths

appveyor.yml

@@ -12,8 +12,8 @@ environment:
     CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
     DEP_MODE: lib-ext
     # This should be identical to the value in .travis.yml
-    OPAM_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
-    OPAM_TEST_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
+    OPAM_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
+    OPAM_TEST_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
   matrix:
     - CYG_ROOT: cygwin
       CYG_ARCH: x86

src_ext/Makefile

@@ -11,8 +11,8 @@ endif
 
 PATCH ?= patch
 
-URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0.tar.gz
-MD5_ocaml = 0863b31da0ab8ef67c5b723206f494da
+URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.1.tar.gz
+MD5_ocaml = 4b494fe0f06af9f3ff5047fc26993e3f
 
 URL_flexdll = https://github.com/alainfrisch/flexdll/archive/0.39.tar.gz
 MD5_flexdll = c8493c7b6e95c4763b89213a9a710af5