Fix build

.github/workflows/workflow.yml

@@ -1,8 +1,8 @@
-name: Main workflow
+name: Builds, tests & co
 
 on:
-  pull_request:
   push:
+  pull_request:
   schedule:
     # Prime the caches every Monday
     - cron: 0 1 * * MON
@@ -13,60 +13,49 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
           - ubuntu-latest
+          - macos-latest
           - windows-latest
-
     runs-on: ${{ matrix.os }}
-
     steps:
       - name: Checkout tree
         uses: actions/checkout@v4
-
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-
       - run: opam install . --deps-only
-
       - run: opam exec -- make all
 
   lint-doc:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout tree
         uses: actions/checkout@v4
-
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-
       - uses: ocaml/setup-ocaml/lint-doc@v3
 
   lint-fmt:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout tree
         uses: actions/checkout@v4
-
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-
       - uses: ocaml/setup-ocaml/lint-fmt@v3
 
   lint-opam:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout tree
         uses: actions/checkout@v4
-
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-
       - uses: ocaml/setup-ocaml/lint-opam@v3

dune-project

@@ -1,41 +1,26 @@
-(lang dune 2.0)
-
-(using menhir 2.0)
-
+(lang dune 3.17)
 (name html_of_wiki)
 
+(generate_opam_files true)
 (implicit_transitive_deps false)
 
 (license "LGPL-2.1 with OCaml linking exception")
-
 (authors "The ocsigen team <dev@ocsigen.org>")
-
-(maintainers
- "The ocsigen team <dev@ocsigen.org>"
- "Leo Valais <leo.valais97@gmail.com>")
-
-(source
- (github ocsigen/html_of_wiki))
-
-(bug_reports "https://github.com/ocsigen/html_of_wiki/issues")
-
-(homepage "https://github.com/ocsigen/html_of_wiki")
-
+(maintainers "The ocsigen team <dev@ocsigen.org>" "Leo Valais <leo.valais97@gmail.com>")
+(source (github ocsigen/html_of_wiki))
 (documentation "https://ocsigen.org/html_of_wiki/2.0/manual/intro")
 
-(generate_opam_files true)
-
 (package
  (name html_of_wiki)
  (synopsis "A wikicreole to HTML compiler")
- (description
-  "a static website generator for software projects, using wikicreole syntax.")
+ (description "a static website generator for software projects, using wikicreole syntax.")
  (depends
+  (ocaml (< 5.0))
   ("cmdliner" (>= 1.1.1))
-  "js_of_ocaml-ppx_deriving_json"
+  ("tyxml"(>= 4.6.0))
+  "base64"
   "js_of_ocaml-ppx"
+  "js_of_ocaml-ppx_deriving_json"
   "ocamlfind"
   "re"
-  "base64"
-  "reason"
-  ("tyxml"(>= 4.6.0))))
+  "reason"))

html_of_wiki.opam

@@ -12,18 +12,20 @@ homepage: "https://github.com/ocsigen/html_of_wiki"
 doc: "https://ocsigen.org/html_of_wiki/2.0/manual/intro"
 bug-reports: "https://github.com/ocsigen/html_of_wiki/issues"
 depends: [
-  "dune" {>= "2.0"}
+  "dune" {>= "3.17"}
+  "ocaml" {< "5.0"}
   "cmdliner" {>= "1.1.1"}
-  "js_of_ocaml-ppx_deriving_json"
+  "tyxml" {>= "4.6.0"}
+  "base64"
   "js_of_ocaml-ppx"
+  "js_of_ocaml-ppx_deriving_json"
   "ocamlfind"
   "re"
-  "base64"
   "reason"
-  "tyxml" {>= "4.6.0"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"