From 00e467c1d5a9d3eeede8ec23e0eaac81d5d34dc7 Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 27 May 2024 21:41:53 +0100 Subject: [PATCH] Upgrade the vendored OCaml compiler to 4.14.2 --- .github/workflows/ci.ml | 4 ++-- .github/workflows/depexts.yml | 2 +- .github/workflows/main.yml | 4 ++-- master_changes.md | 2 ++ release/Makefile | 2 +- src_ext/Makefile | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml index a7e14541c02..70a6e0ef045 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", "c687553afb80373165068d67f33512b7ad39e6a3"); - ("OPAM_REPO_SHA", "c687553afb80373165068d67f33512b7ad39e6a3"); + ("OPAM_TEST_REPO_SHA", "c61e9068d528d92b1d6ac84a06cf44489b10b835"); + ("OPAM_REPO_SHA", "c61e9068d528d92b1d6ac84a06cf44489b10b835"); ("SOLVER", ""); (* Cygwin configuration *) ("CYGWIN_MIRROR", "http://mirrors.kernel.org/sourceware/cygwin/"); diff --git a/.github/workflows/depexts.yml b/.github/workflows/depexts.yml index 54412a45d25..fe29bbfc855 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: c687553afb80373165068d67f33512b7ad39e6a3 + OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835 jobs: opam-cache: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 215c1fd1173..4f68e27c606 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: c687553afb80373165068d67f33512b7ad39e6a3 - OPAM_REPO_SHA: c687553afb80373165068d67f33512b7ad39e6a3 + OPAM_TEST_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835 + OPAM_REPO_SHA: c61e9068d528d92b1d6ac84a06cf44489b10b835 SOLVER: CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/ CYGWIN_ROOT: D:\cygwin diff --git a/master_changes.md b/master_changes.md index 22dd06415f5..cc83d1da55c 100644 --- a/master_changes.md +++ b/master_changes.md @@ -97,11 +97,13 @@ users) ## Build * Upgrade vendored cmdliner to 1.3.0 [#5970 @kit-ty-kate] * Remove unused/untested Makefile targets lib-pkg [#5494 @kit-ty-kate] + * Upgrade vendored OCaml compiler to 4.14.2 [#5976 @kit-ty-kate] ## Infrastructure * Ensure GNU coreutils available on the macOS 14 CI runners [#5938 @dra27] ## Release scripts + * Upgrade the OCaml compiler used for releases to 4.14.2 [#5976 @kit-ty-kate] ## Install script diff --git a/release/Makefile b/release/Makefile index 880a0cd2953..d559c8eb576 100644 --- a/release/Makefile +++ b/release/Makefile @@ -3,7 +3,7 @@ VERSION = $(shell git describe $(TAG)) OPAM_VERSION = $(subst -,~,$(VERSION)) GIT_URL = .. -OCAMLV = 4.14.0 +OCAMLV = 4.14.2 # currently hardcoded in Dockerfile.in OCAML_URL = https://caml.inria.fr/pub/distrib/ocaml-$(basename $(OCAMLV))/ocaml-$(OCAMLV).tar.gz diff --git a/src_ext/Makefile b/src_ext/Makefile index 3136bc64365..84f03290422 100644 --- a/src_ext/Makefile +++ b/src_ext/Makefile @@ -8,8 +8,8 @@ endif PATCH ?= patch -URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.1.tar.gz -MD5_ocaml = c45b013a233c9a4b80c3930d723d19dd +URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.2.tar.gz +MD5_ocaml = f2fa20be4eea01f837b3556ff282d9b0 URL_flexdll = https://github.com/ocaml/flexdll/archive/0.43.tar.gz MD5_flexdll = 6ce706f6c65b2c5adf5791fac678f090