Skip to content

Commit 8ab19c2

Browse files
authored
ocaml 5.1.1, melange 2.2.0 (#147)
1 parent 90e3e27 commit 8ab19c2

File tree

10 files changed

+15
-17
lines changed

10 files changed

+15
-17
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- run: python3 -m pip install -r ./pip-requirements.txt
1919
- uses: ocaml/setup-ocaml@v2
2020
with:
21-
ocaml-compiler: 5.1.x
21+
ocaml-compiler: 5.1.1
2222
dune-cache: false # can cause trouble when generating melange docs in step below: https://github.com/ocaml/dune/issues/7720
2323
- name: Install all deps
2424
run: make install

.github/workflows/publish-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- run: python3 -m pip install -r ./pip-requirements.txt
1717
- uses: ocaml/setup-ocaml@v2
1818
with:
19-
ocaml-compiler: 5.1.x
19+
ocaml-compiler: 5.1.1
2020
dune-cache: false # can cause trouble when generating melange docs in step below: https://github.com/ocaml/dune/issues/7720
2121
- name: Install all deps
2222
run: make install

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ help: ## Print this help message
1313

1414
.PHONY: create-switch
1515
create-switch: ## Create opam switch
16-
opam switch create . 5.1.0 -y --deps-only
16+
opam switch create . 5.1.1 -y --deps-only
1717

1818
.PHONY: init
1919
init: create-switch install ## Configure everything to develop this repository in local

docs/build-system.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ First of all, create an opam switch, as shown in the [package management
6565
section](package-management.md):
6666

6767
```bash
68-
opam switch create . 5.1.0 --deps-only
68+
opam switch create . 5.1.1 --deps-only
6969
```
7070

7171
Install the latest versions of Dune and Melange in the switch:

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For Visual Studio Code, install the [OCaml Platform Visual Studio Code
4242
extension](https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform)
4343
from the Visual Studio Marketplace. When you load an OCaml source file for the
4444
first time, you may be prompted to select the toolchain to use. Select the
45-
version of OCaml you are using from the list, such as 5.1.0. Further
45+
version of OCaml you are using from the list, such as 5.1.1. Further
4646
instructions for configuration can be found in the [extension
4747
repository](https://github.com/ocamllabs/vscode-ocaml-platform#setting-up-the-extension-for-your-project).
4848

docs/how-to-guides.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ switch](https://opam.ocaml.org/blog/opam-local-switches/) to start working on
5959
our library:
6060

6161
```bash
62-
opam switch create . 5.1.0 -y --deps-only
62+
opam switch create . 5.1.1 -y --deps-only
6363
```
6464

6565
Once this step is done, we can call `dune` from the library folder, but first we
@@ -449,7 +449,7 @@ opam update
449449
Now, update the version of the OCaml compiler in the local switch to 5.1:
450450

451451
```bash
452-
opam install --update-invariant ocaml-base-compiler.5.1.0
452+
opam install --update-invariant ocaml-base-compiler.5.1.1
453453
```
454454

455455
Finally, we can upgrade all packages to get Melange v2 and the latest version of
@@ -466,7 +466,7 @@ subcommand:
466466
opam list --installed melange
467467
# Packages matching: name-match(melange) & installed
468468
# Name # Installed # Synopsis
469-
melange 2.0.0 Toolchain to produce JS from Reason/OCaml
469+
melange 2.2.0 Toolchain to produce JS from Reason/OCaml
470470
```
471471

472472
Before building, we have to update some parts of the configuration to make it

docs/melange-for-x-developers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ architectures are not included in the pre-built binaries.
581581
### OCaml compiler version
582582

583583
ReScript is compatible with the 4.06 version of the OCaml compiler, while
584-
Melange is compatible with the version 5.1.0 (as of Oct 2023).
584+
Melange is compatible with the version 5.1.1 (as of Dec 2023).
585585

586586
### Editor integration
587587

docs/package-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ in the project folder.
158158
If it does not exist, we can create it with:
159159

160160
```text
161-
opam switch create . 5.1.0 --deps-only
161+
opam switch create . 5.1.1 --deps-only
162162
```
163163

164164
If it exists, we can install the dependencies of the project with:

documentation-site.opam

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ depends: [
2727
]
2828
dev-repo: "git+https://github.com/melange-re/melange-re.github.io.git"
2929
pin-depends: [
30-
[ "melange.dev" "git+https://github.com/melange-re/melange.git#251e0d3e0d020e0a6670375da2db6284ec0627bd" ]
31-
[ "melange-playground.dev" "git+https://github.com/melange-re/melange.git#251e0d3e0d020e0a6670375da2db6284ec0627bd" ]
32-
[ "reason-react.dev" "git+https://github.com/reasonml/reason-react.git#18a8fa2b3524b5f5cf0154875f963db096a992e9" ]
33-
[ "reason-react-ppx.dev" "git+https://github.com/reasonml/reason-react.git#18a8fa2b3524b5f5cf0154875f963db096a992e9" ]
30+
[ "melange.dev" "git+https://github.com/melange-re/melange.git#97ebd7d3d3f8fb66dbbf4df6691b0cf4b95dc153" ]
31+
[ "melange-playground.dev" "git+https://github.com/melange-re/melange.git#97ebd7d3d3f8fb66dbbf4df6691b0cf4b95dc153" ]
3432
[ "cmarkit.dev" "git+https://github.com/dbuenzli/cmarkit.git#f37c8ea86fd0be8dba7a8babcee3682e0e047d91" ]
3533
]
3634
build: [

playground/src/app.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,19 +137,19 @@ function Sidebar({ onExampleClick }) {
137137
<div className="Versions">
138138
<span className="Version">
139139
<span className="Text-xs">{"Melange"}</span>
140-
<span className="Text-xs Number">{"dev"}</span>
140+
<span className="Text-xs Number">{"2.2.0"}</span>
141141
</span>
142142
<span className="Version">
143143
<span className="Text-xs">{"OCaml"}</span>
144-
<span className="Text-xs Number">{"5.1.0"}</span>
144+
<span className="Text-xs Number">{"5.1.1"}</span>
145145
</span>
146146
<span className="Version">
147147
<span className="Text-xs">{"Reason"}</span>
148148
<span className="Text-xs Number">{"3.10.0"}</span>
149149
</span>
150150
<span className="Version">
151151
<span className="Text-xs">{"ReasonReact"}</span>
152-
<span className="Text-xs Number">{"dev"}</span>
152+
<span className="Text-xs Number">{"0.13.0"}</span>
153153
</span>
154154
</div>
155155
</div>) : null}

0 commit comments

Comments
 (0)