Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade the vendored OCaml compiler to 4.14.2 #5976

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Upgrade the vendored OCaml compiler to 4.14.2 #5976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/");
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/depexts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion release/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src_ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading