From 095895baf57c40661b69ffe3e1b01525c90ddf0e Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Wed, 5 Jun 2024 23:30:06 +0100 Subject: [PATCH] Wind CI forwards to the Windows compilers --- .github/workflows/ci.ml | 4 ++-- .github/workflows/depexts.yml | 2 +- .github/workflows/main.yml | 4 ++-- master_changes.md | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml index 70a6e0ef045..95e71522813 100644 --- 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 index fe29bbfc855..c28c2b1a684 100644 --- 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 index 4f68e27c606..e1928496e4a 100644 --- 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 index 8f559742d8a..36d8aeff725 100644 --- a/master_changes.md +++ b/master_changes.md @@ -102,6 +102,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]