Fixing github CI

.github/workflows/doc-deploy.yml

@@ -25,9 +25,10 @@ jobs:
           ocaml-version: 4.10.0
       - name: setup-doc
         run: |
-          sudo apt install -yqq python3-sphinx python3-sphinx-rtd-theme
-          opam install -y dune odoc 
+          sudo apt install -yqq python3-sphinx python3-sphinx-rtd-theme libgeoip-dev
+          opam install -y dune odoc json-data-encoding json-data-encoding ezjsonm uuidm geoip js_of_ocaml-lwt calendar tls lwt_log  cohttp-lwt-jsoo ppxlib  
       - run: opam pin add . -y --no-action
+      - run: opam pin https://github.com/hernoufM/digodoc-search-api.git
       - run: opam depext -y digodoc digodoc_lib meta_file ez_html htmlize
         if: steps.cache-opam.outputs.cache-hit != 'true'
       - run: opam install -y ./*.opam --deps-only --with-test

.github/workflows/workflow.yml

@@ -49,10 +49,20 @@ jobs:
           git config --global user.email github-actions-bot@users.noreply.github.com
 
       - run: opam pin add . -y --no-action
+
+      - run: opam depext -y geoip 
+        if : matrix.os != 'macos-latest'
 
+      - run: brew install geoip
+        if : matrix.os == 'macos-latest'
+
+      - run: opam pin https://github.com/hernoufM/digodoc-search-api.git
+
       - run: opam depext -y digodoc digodoc_lib meta_file ez_html htmlize frontend digodoc_common
         if: steps.cache-opam.outputs.cache-hit != 'true'
 
+      - run : opam install json-data-encoding json-data-encoding ezjsonm uuidm geoip js_of_ocaml-lwt calendar tls lwt_log  cohttp-lwt-jsoo ppxlib  
+
       - run: opam install -y ./*.opam --deps-only --with-test
         if: steps.cache-opam.outputs.cache-hit != 'true'
 

frontend.opam

@@ -42,8 +42,10 @@ depends: [
   "dune" {>= "2.6.0"}
   "search-api" {>= "~dev"}
   "js_of_ocaml" {>= "3.0"}
+  "ez_api" {>= "0.1.0"}
   "ppx_deriving_jsoo" {>= "0.1"}
   "js_of_ocaml-ppx" {>= "3.0"}
+  "lwt_ppx" {>= "2.0.2"}
   "ppx_inline_test" {with-test}
   "ppx_expect" {with-test}
   "odoc" {with-doc}

src/frontend/package.toml

@@ -38,11 +38,13 @@ gen-version = "version.ml"
 [dependencies]
 js_of_ocaml = ">=3.0"
 search-api = ">=~dev"
+ez_api = ">=0.1.0"
 
 # package tools dependencies
 [tools]
 js_of_ocaml-ppx = ">=3.0"
 ppx_deriving_jsoo = ">=0.1"
+lwt_ppx = ">=2.0.2"
 
 # package fields (depends on package skeleton)
 [fields]

test/patchtmltests.ml

@@ -1,3 +1,5 @@
+open Digodoc_common
+
 let () =
   let test_cases = [|
     (".", "index.html");
@@ -30,7 +32,7 @@ let () =
       title = None
     }
     in
-    let result = Htmlize.Patchtml.handle_link_omd ~is_raw:false sent in
+    let result = Patchtml.handle_link_omd ~is_raw:false sent in
     let ok = result = expected in
     if not ok then Format.printf "expected: %s but got %s@." expected.destination sent.destination;
 
@@ -63,7 +65,7 @@ let () =
       title = None
     }
     in
-    let result = Htmlize.Patchtml.handle_link_omd ~is_raw:true sent in
+    let result = Patchtml.handle_link_omd ~is_raw:true sent in
     let ok = result = expected in
     if not ok then Format.printf "expected: %s but got %s@." expected.destination sent.destination;