diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index c7965afff0..c75247bf18 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -2,7 +2,7 @@ # Install dev dependencies from OPAM opam init -y --bare --disable-sandboxing -opam switch create 5.2.0 --packages ocaml-option-static +opam switch create 5.2.1 --packages ocaml-option-static opam install . --deps-only -y # For IDE support, install the OCaml language server diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d52e13f72a..8a7ccdb816 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,23 +87,23 @@ jobs: matrix: include: - os: ubuntu-latest # x64 - ocaml_compiler: ocaml-variants.5.2.0+options,ocaml-option-static + ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static upload_binaries: true upload_libs: true # Build the playground compiler and run the benchmarks on the fastest runner build_playground: true benchmarks: true - os: buildjet-2vcpu-ubuntu-2204-arm # ARM - ocaml_compiler: ocaml-variants.5.2.0+options,ocaml-option-static + ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static upload_binaries: true - os: macos-13 # x64 - ocaml_compiler: 5.2.0 + ocaml_compiler: 5.2.1 upload_binaries: true - os: macos-14 # ARM - ocaml_compiler: 5.2.0 + ocaml_compiler: 5.2.1 upload_binaries: true - os: windows-latest - ocaml_compiler: 5.2.0 + ocaml_compiler: 5.2.1 upload_binaries: true # Verify that the compiler still builds with older OCaml versions diff --git a/CHANGELOG.md b/CHANGELOG.md index cf206f1101..f893536f57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - AST cleanup: Represent the arity of uncurried function definitions directly in the AST. https://github.com/rescript-lang/rescript/pull/7197 - AST cleanup: Remove Pexp_function from the AST. https://github.com/rescript-lang/rescript/pull/7198 - Remove unused code from Location and Rescript_cpp modules. https://github.com/rescript-lang/rescript/pull/7150 +- Build with OCaml 5.2.1. https://github.com/rescript-lang/rescript-compiler/pull/7201 # 12.0.0-alpha.5 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99e00963fd..f4b114ffc7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,7 @@ Make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed on opam init # Any recent OCaml version works as a development compiler -opam switch create 5.2.0 # can also create local switch with opam switch create +opam switch create 5.2.1 # can also create local switch with opam switch create # Install dev dependencies from OPAM opam install . --deps-only --with-test --with-dev-setup -y