Skip to content

Commit 1ff0770

Browse files
authored
Merge pull request #5998 from dra27/wind-ci
Wind CI forwards to the Windows compilers
2 parents b97e1aa + 095895b commit 1ff0770

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/ci.ml

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

.github/workflows/depexts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ defaults:
1818
env:
1919
OPAMVERSION: 2.1.0
2020
OPAM_REPO: https://github.com/ocaml/opam-repository.git
21-
OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
21+
OPAM_REPO_SHA: dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a
2222

2323
jobs:
2424
opam-cache:

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ env:
2626
OPAMBSROOT: ~/.cache/.opam.cached
2727
OPAM12CACHE: ~/.cache/opam1.2/cache
2828
OPAM_REPO: https://github.com/ocaml/opam-repository.git
29-
OPAM_TEST_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
30-
OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
29+
OPAM_TEST_REPO_SHA: dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a
30+
OPAM_REPO_SHA: dff745994c64d083a6ba3ddc5a9c28ed0ad0f40a
3131
SOLVER:
3232
CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
3333
CYGWIN_ROOT: D:\cygwin

master_changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ users)
104104

105105
## Infrastructure
106106
* Ensure GNU coreutils available on the macOS 14 CI runners [#5938 @dra27]
107+
* Update the opam-repository testing sha to include the new compiler packages in opam-repository [#5998 @dra27]
107108

108109
## Release scripts
109110
* Upgrade the OCaml compiler used for releases to 4.14.2 [#5976 @kit-ty-kate]

0 commit comments

Comments
 (0)