Skip to content

Commit

Permalink
Merge pull request #45 from melange-re/ocaml-52
Browse files Browse the repository at this point in the history
Upgrade to OCaml 5.2.0
  • Loading branch information
feihong authored Jun 7, 2024
2 parents 710af5b + eb8068d commit 13e86b9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cache: npm
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: 5.1.1
ocaml-compiler: 5.2.0
- name: Install all deps
run: npm run install:npm-opam
- name: Format check
Expand Down
6 changes: 3 additions & 3 deletions docs/sandwich-tests/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ Open `melange-for-react-devs.opam` and add a corresponding entry in the

```
depends: [
"ocaml" {>= "5.1.1"}
"ocaml" {>= "5.2.0"}
"reason" {>= "3.10.0"}
"dune" {>= "3.8"}
"melange" {>= "4.0.0-51"}
"melange" {>= "4.0.0-52"}
"reason-react" {>= "0.14.0"}
"reason-react-ppx" {>= "0.14.0"}
"melange-fest" {>= "0.1.0"} // [!code ++]
Expand Down Expand Up @@ -79,7 +79,7 @@ The output will look something like this:

```
# switch compiler description
→ ~/melange-for-react-devs ocaml-base-compiler.5.1.1 ~/melange-for-react-devs
→ ~/melange-for-react-devs ocaml-base-compiler.5.2.0 ~/melange-for-react-devs
default ocaml.5.1.0 default
[NOTE] Current switch has been selected based on the current directory.
Expand Down
4 changes: 2 additions & 2 deletions melange-for-react-devs.opam
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ license: "MIT"
homepage: "https://github.com/melange-re/melange-for-react-devs"
bug-reports: "https://github.com/melange-re/melange-for-react-devs"
depends: [
"ocaml" {>= "5.1.1"}
"ocaml" {>= "5.2.0"}
"reason" {>= "3.10.0"}
"dune" {>= "3.8"}
"melange" {>= "4.0.0-51"}
"melange" {>= "4.0.0-52"}
"reason-react" {>= "0.14.0"}
"reason-react-ppx" {>= "0.14.0"}
"melange-fest" {>= "0.1.0"}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"preinstall:opam": "opam update",
"install:opam": "opam install -y . --deps-only --with-test",
"check-npm-deps": "opam exec opam-check-npm-deps",
"init": "opam switch create . 5.1.1 -y --deps-only && npm run install:npm-opam",
"init": "opam switch create . 5.2.0 -y --deps-only && npm run install:npm-opam",
"install:npm-opam": "npm install && npm run install:opam && npm run check-npm-deps",
"dune": "opam exec -- dune",
"build": "npm run dune -- build",
Expand Down

0 comments on commit 13e86b9

Please sign in to comment.