Skip to content

Commit a26fb1d

Browse files
committed
Advance to ocaml 5.4 to fix ocamldoc issues
ocamldoc refused to build the parser because of something that Menhir was doing. Moving forward to 5.4 fixes the problem
1 parent 8ea04f8 commit a26fb1d

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

.github/workflows/pull-request.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup OCaml
2323
uses: ocaml/setup-ocaml@v3
2424
with:
25-
ocaml-compiler: 4
25+
ocaml-compiler: 5
2626

2727
- name: Install APT dependencies
2828
run: |
@@ -40,8 +40,9 @@ jobs:
4040

4141
- name: Install OCaml tools and libraries
4242
run: |
43-
opam init --no-setup --disable-sandboxing --compiler=4.14.3
44-
opam env
43+
opam init --no-setup --disable-sandboxing
44+
opam switch create 5.4.1
45+
eval $(opam env --switch=5.4.1)
4546
opam install . --deps-only --with-test --with-doc --locked --yes
4647
4748
- name: Build

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following commands are sufficient to install requirements and to build iii o
6868
apt update
6969
apt install -y libgmp-dev opam pkg-config
7070
pip3 install -r requirements.txt
71-
opam init --no-setup --disable-sandboxing --compiler=4.14.3
71+
opam init --no-setup --disable-sandboxing --compiler=5.4.1
7272
opam install . --deps-only --with-test --with-doc --locked --yes
7373
eval $(opam env)
7474

@@ -100,7 +100,7 @@ not work because it limits the use of bit-precise integers to 128 bits.
100100
opam init
101101
eval $(opam env --switch=default)
102102
pip3 install -r requirements.txt
103-
opam init --no-setup --disable-sandboxing --compiler=4.14.2
103+
opam init --no-setup --disable-sandboxing --compiler=5.4.1
104104
opam install . --deps-only --with-test --with-doc --locked --yes
105105
eval $(opam env)
106106
git submodule init

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
("alcotest" :with-test)
3333
"linenoise"
3434
("menhir" :build)
35-
("ocaml" (>= "4.14"))
35+
("ocaml" (>= "5.4"))
3636
("ocolor" (>= "1.2.2"))
3737
"odoc"
3838
"yojson"

isa-tools.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ depends: [
2929
"alcotest" {with-test}
3030
"linenoise"
3131
"menhir" {build}
32-
"ocaml" {>= "4.14"}
32+
"ocaml" {>= "5.4"}
3333
"ocolor" {>= "1.2.2"}
3434
"odoc"
3535
"yojson"

isa-tools.opam.locked

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ depends: [
2727
"alcotest" {= "1.9.1" & with-test}
2828
"astring" {= "0.8.5"}
2929
"base-bigarray" {= "base"}
30+
"base-domains" {= "base"}
31+
"base-effects" {= "base"}
32+
"base-nnp" {= "base"}
3033
"base-threads" {= "base"}
3134
"base-unix" {= "base"}
3235
"camlp-streams" {= "5.0.1"}
@@ -46,9 +49,10 @@ depends: [
4649
"menhirGLR" {= "20260209"}
4750
"menhirLib" {= "20260209"}
4851
"menhirSdk" {= "20260209"}
49-
"ocaml" {= "4.14.3"}
50-
"ocaml-base-compiler" {= "4.14.3"}
51-
"ocaml-config" {= "2"}
52+
"ocaml" {= "5.4.1"}
53+
"ocaml-base-compiler" {= "5.4.1"}
54+
"ocaml-compiler" {= "5.4.1"}
55+
"ocaml-config" {= "3"}
5256
"ocaml-options-vanilla" {= "1"}
5357
"ocaml-syntax-shims" {= "1.0.0" & with-test}
5458
"ocamlbuild" {= "0.16.1"}

0 commit comments

Comments
 (0)