Skip to content

Commit 638fb25

Browse files
committed
Experiment: build with OCaml 5
1 parent fbbb84b commit 638fb25

5 files changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
fail-fast: false
111111
matrix:
112112
os: [macos-latest, ubuntu-latest, windows-latest, macos-arm]
113-
ocaml_compiler: [4.14.0]
113+
ocaml_compiler: [5.0.0]
114114

115115
runs-on: ${{matrix.os}}
116116

@@ -145,6 +145,7 @@ jobs:
145145
uses: ocaml/setup-ocaml@v2
146146
with:
147147
ocaml-compiler: ${{matrix.ocaml_compiler}}
148+
allow-prelease-opam: true
148149
opam-pin: false
149150
opam-depext: false
150151

.ocamlformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
profile = default
2-
version = 0.22.4
2+
version = 0.24.1
33

44
field-space = tight-decl
55
break-cases = toplevel

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ test: lib
2828

2929
test-syntax:
3030
bash ./scripts/test_syntax.sh
31-
make reanalyze
31+
# make reanalyze
3232
bash ./scripts/testok.sh
3333

3434
test-syntax-roundtrip:
3535
ROUNDTRIP_TEST=1 bash ./scripts/test_syntax.sh
36-
make reanalyze
36+
# make reanalyze
3737
bash ./scripts/testok.sh
3838

3939
test-gentype:

dune-project

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
(ocaml
2222
(>= 4.10))
2323
(ocamlformat
24-
(= 0.22.4))
24+
(= 0.24.1))
2525
(cppo
2626
(= 1.6.9))
2727
(js_of_ocaml-compiler
28-
(= 4.0.0))
28+
(= 4.1.0))
2929
(ounit2
3030
(= 2.2.6))
31-
(reanalyze
32-
(= 2.23.0))
31+
; No OCaml 5 compatible reanalyze on OPAM yet
32+
; (reanalyze
33+
; (= 2.23.0))
3334
dune))

rescript.opam

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ homepage: "https://github.com/rescript-lang/rescript-compiler"
88
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
99
depends: [
1010
"ocaml" {>= "4.10"}
11-
"ocamlformat" {= "0.22.4"}
11+
"ocamlformat" {= "0.24.1"}
1212
"cppo" {= "1.6.9"}
13-
"js_of_ocaml-compiler" {= "4.0.0"}
13+
"js_of_ocaml-compiler" {= "4.1.0"}
1414
"ounit2" {= "2.2.6"}
15-
"reanalyze" {= "2.23.0"}
1615
"dune"
1716
]
1817
build: [

0 commit comments

Comments
 (0)