Merge pull request #5998 from dra27/wind-ci

Wind CI forwards to the Windows compilers
ocaml · Jun 6, 2024 · 1ff0770 · 1ff0770
2 parents b97e1aa + 095895b
commit 1ff0770
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.ml b/.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/");

diff --git a/.github/workflows/depexts.yml b/.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:

diff --git a/.github/workflows/main.yml b/.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

diff --git a/master_changes.md b/master_changes.md
@@ -104,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]