Skip to content

Commit 6cf6ff3

Browse files
authored
Merge pull request #5976 from kit-ty-kate/vendor-4.14.2
Upgrade the vendored OCaml compiler to 4.14.2
2 parents 945a98a + 00e467c commit 6cf6ff3

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
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", "c687553afb80373165068d67f33512b7ad39e6a3");
480-
("OPAM_REPO_SHA", "c687553afb80373165068d67f33512b7ad39e6a3");
479+
("OPAM_TEST_REPO_SHA", "c61e9068d528d92b1d6ac84a06cf44489b10b835");
480+
("OPAM_REPO_SHA", "c61e9068d528d92b1d6ac84a06cf44489b10b835");
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: c687553afb80373165068d67f33512b7ad39e6a3
21+
OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
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: c687553afb80373165068d67f33512b7ad39e6a3
30-
OPAM_REPO_SHA: c687553afb80373165068d67f33512b7ad39e6a3
29+
OPAM_TEST_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
30+
OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835
3131
SOLVER:
3232
CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
3333
CYGWIN_ROOT: D:\cygwin

master_changes.md

+2
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,13 @@ users)
9797
## Build
9898
* Upgrade vendored cmdliner to 1.3.0 [#5970 @kit-ty-kate]
9999
* Remove unused/untested Makefile targets lib-pkg [#5494 @kit-ty-kate]
100+
* Upgrade vendored OCaml compiler to 4.14.2 [#5976 @kit-ty-kate]
100101

101102
## Infrastructure
102103
* Ensure GNU coreutils available on the macOS 14 CI runners [#5938 @dra27]
103104

104105
## Release scripts
106+
* Upgrade the OCaml compiler used for releases to 4.14.2 [#5976 @kit-ty-kate]
105107

106108
## Install script
107109

release/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ VERSION = $(shell git describe $(TAG))
33
OPAM_VERSION = $(subst -,~,$(VERSION))
44
GIT_URL = ..
55

6-
OCAMLV = 4.14.0
6+
OCAMLV = 4.14.2
77
# currently hardcoded in Dockerfile.in
88
OCAML_URL = https://caml.inria.fr/pub/distrib/ocaml-$(basename $(OCAMLV))/ocaml-$(OCAMLV).tar.gz
99

src_ext/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ endif
88

99
PATCH ?= patch
1010

11-
URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.1.tar.gz
12-
MD5_ocaml = c45b013a233c9a4b80c3930d723d19dd
11+
URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.2.tar.gz
12+
MD5_ocaml = f2fa20be4eea01f837b3556ff282d9b0
1313

1414
URL_flexdll = https://github.com/ocaml/flexdll/archive/0.43.tar.gz
1515
MD5_flexdll = 6ce706f6c65b2c5adf5791fac678f090

0 commit comments

Comments
 (0)