update for tyxml 4.6.0

ocsigen · Jul 29, 2024 · c0f1667 · c0f1667
2 parents 3686648 + 0ce70f4
commit c0f1667
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -16,10 +16,6 @@ jobs:
           - macos-latest
           - ubuntu-latest
           - windows-latest
-        ocaml-compiler:
-          - "4.12"
-          - "4.13"
-          - "4.14"
 
     runs-on: ${{ matrix.os }}
 
@@ -28,10 +24,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          allow-prerelease-opam: true
+          ocaml-compiler: "4.14"
 
       - run: opam install . --deps-only
 
@@ -44,12 +39,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-          allow-prerelease-opam: true
 
-      - uses: ocaml/setup-ocaml/lint-doc@v2
+      - uses: ocaml/setup-ocaml/lint-doc@v3
 
   lint-fmt:
     runs-on: ubuntu-latest
@@ -58,12 +52,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-          allow-prerelease-opam: true
 
-      - uses: ocaml/setup-ocaml/lint-fmt@v2
+      - uses: ocaml/setup-ocaml/lint-fmt@v3
 
   lint-opam:
     runs-on: ubuntu-latest
@@ -72,9 +65,8 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "4.14"
-          allow-prerelease-opam: true
 
-      - uses: ocaml/setup-ocaml/lint-opam@v2
+      - uses: ocaml/setup-ocaml/lint-opam@v3
diff --git a/dune-project b/dune-project
@@ -38,4 +38,4 @@
   "re"
   "base64"
   "reason"
-  "tyxml"))
+  ("tyxml"(>= 4.6.0))))
diff --git a/html_of_wiki.opam b/html_of_wiki.opam
@@ -20,7 +20,7 @@ depends: [
   "re"
   "base64"
   "reason"
-  "tyxml"
+  "tyxml" {>= "4.6.0"}
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/src/ohow/site_ocsimore.ml b/src/ohow/site_ocsimore.ml
@@ -28,10 +28,8 @@ type script_kind =
 
 let make_script = function
   | Src src ->
-    Html.(
-      script ~a:[ a_mime_type "text/javascript"; a_src src ] (cdata_script ""))
-  | Js js ->
-    Html.(script ~a:[ a_mime_type "text/javascript" ] (cdata_script js))
+    Html.(script ~a:[ a_script_type `Javascript; a_src src ] (cdata_script ""))
+  | Js js -> Html.(script ~a:[ a_script_type `Javascript ] (cdata_script js))
 
 let process_script args c =
   match List.assoc "src" args with