fix: resolve compilation errors after rebase - remove github_pat references, add api_timeout, fix run_bench calls

Author: lykimq

bot-components/Git_utils.ml

@@ -4,7 +4,6 @@ open Bot_info
 open Lwt.Infix
 open Lwt.Syntax
 open Utils
-open Bot_info
 
 let report_status ?(mask = []) ?(stderr_content = "") command report code =
   let stderr =
@@ -186,15 +185,3 @@ let github_repo_of_gitlab_url ~gitlab_mapping ~http_repo_url =
                     github_full_name )
          in
          (owner, repo) )
-
-let init_git_bare_repository ~bot_info =
-  let* () = Lwt_io.printl "Initializing repository..." in
-  "git init --bare"
-  |&& f {|git config user.email "%s"|} bot_info.email
-  |&& f {|git config user.name "%s"|} bot_info.github_name
-  |> execute_cmd ~mask:[bot_info.github_pat]
-  >>= function
-  | Ok _ ->
-      Lwt_io.printl "Bare repository initialized."
-  | Error e ->
-      Lwt_io.printlf "Error while initializing bare repository: %s." e

src/ci/minimization.ml

@@ -1,5 +1,4 @@
 open Bot_components
-open Git_utils
 open Base
 open Utils
 open Bot_components.Git_utils

src/webhooks/github.ml

@@ -4,7 +4,6 @@ open Cohttp_lwt_unix
 open Bot_components
 open Bot_components.GitHub_types
 open Bot_components.GitHub_GitLab_sync
-open Bench_utils
 open String_utils
 open Utils
 open Bot_components.Git_utils
@@ -171,7 +170,7 @@ let handle_comment_created ~bot_info ~key ~app_id ~github_bot_name
               Bot_components.Github_installations.action_as_github_app ~bot_info
                 ~key ~app_id ~owner:comment_info.issue.issue.owner
                 (fun ~bot_info ->
-                  run_bench ~bot_info ~repo_config_table
+                  Bench.run_bench ~bot_info ~repo_config_table
                     ~key_value_pairs:[("coq_native", "yes")]
                     comment_info ) )
             |> Lwt.async ;
@@ -190,7 +189,7 @@ let handle_comment_created ~bot_info ~key ~app_id ~github_bot_name
               Bot_components.Github_installations.action_as_github_app ~bot_info
                 ~key ~app_id ~owner:comment_info.issue.issue.owner
                 (fun ~bot_info ->
-                  run_bench ~bot_info ~repo_config_table comment_info ) )
+                  Bench.run_bench ~bot_info ~repo_config_table comment_info ) )
             |> Lwt.async ;
             Server.respond_string ~status:`OK
               ~body:(f "Received a request to start the bench.")

tests/generic_bot_demo_test.ml

@@ -96,8 +96,7 @@ github = "my-org/my-repo"
   let gitlab_instances = Hashtbl.create (module String) in
   Hashtbl.set gitlab_instances ~key:"gitlab.com" ~data:("test-bot", "test-token") ;
   let bot_info =
-    { Bot_info.github_pat= "test-token"
-    ; github_install_token= None
+    { Bot_info.github_install_token= Some "test-token"
     ; gitlab_instances
     ; github_name= "test-bot"
     ; email= "[email protected]"

tests/test_bot_info.ml

@@ -8,7 +8,8 @@ let create_bot_info ~github_install_token =
   ; email= "[email protected]"
   ; domain= "test.com"
   ; gitlab_instances= Hashtbl.create (module String)
-  ; app_id= 12345 }
+  ; app_id= 12345
+  ; api_timeout= 5.0 }
 
 let test_uses_github_app_token_when_available () =
   let bot_info =

tests/test_helpers.ml

@@ -8,8 +8,7 @@ let create_mock_bot_info () =
   let gitlab_instances = Hashtbl.create (module String) in
   Hashtbl.set gitlab_instances ~key:"gitlab.com"
     ~data:("test-name", "test-token") ;
-  { Bot_info.github_pat= "test-token"
-  ; github_install_token= None
+  { Bot_info.github_install_token= None
   ; gitlab_instances
   ; github_name= "test-bot"
   ; email= "[email protected]"
@@ -33,8 +32,7 @@ let create_real_bot_info () =
       | None ->
           () ) ;
       Some
-        { Bot_info.github_pat= token
-        ; github_install_token= None
+        { Bot_info.github_install_token= Some token
         ; gitlab_instances
         ; github_name= "test-bot"
         ; email= "[email protected]"