Merge pull request #78 from vohoanglong0107/fix-merge-try-build-url

fix: merge and try build url

Author: Kobzol

src/github/api/client.rs

@@ -7,8 +7,8 @@ use tracing::log;
 use crate::bors::event::PullRequestComment;
 use crate::bors::{CheckSuite, CheckSuiteStatus, Comment, RepositoryClient};
 use crate::config::{RepositoryConfig, CONFIG_FILE_PATH};
+use crate::github::api::base_github_html_url;
 use crate::github::api::operations::{merge_branches, set_branch_to_commit, MergeError};
-use crate::github::api::{base_github_html_url, base_github_url};
 use crate::github::{Branch, CommitSha, GithubRepoName, PullRequest, PullRequestNumber};
 
 /// Provides access to a single app installation (repository) using the GitHub API.
@@ -85,8 +85,7 @@ impl RepositoryClient for GithubRepositoryClient {
             .client
             .get(
                 format!(
-                    "{}/repos/{}/{}/branches/{name}",
-                    base_github_url(),
+                    "/repos/{}/{}/branches/{name}",
                     self.repo_name.owner(),
                     self.repo_name.name(),
                 )
@@ -153,8 +152,7 @@ impl RepositoryClient for GithubRepositoryClient {
             .client
             .get(
                 format!(
-                    "{}/repos/{}/{}/commits/{}/check-suites",
-                    base_github_url(),
+                    "/repos/{}/{}/commits/{}/check-suites",
                     self.repo_name.owner(),
                     self.repo_name.name(),
                     sha.0

src/github/api/mod.rs

@@ -25,10 +25,6 @@ fn base_github_html_url() -> &'static str {
     "https://github.com"
 }
 
-fn base_github_url() -> &'static str {
-    "https://api.github.com"
-}
-
 /// Provides access to managed GitHub repositories.
 pub struct GithubAppState {
     client: Octocrab,

src/github/api/operations.rs

@@ -1,4 +1,3 @@
-use crate::github::api::base_github_url;
 use http::StatusCode;
 use octocrab::params::repos::Reference;
 use thiserror::Error;
@@ -42,19 +41,7 @@ pub async fn merge_branches(
     commit_message: &str,
 ) -> Result<CommitSha, MergeError> {
     let client = repo.client();
-    let merge_url = repo
-        .repository
-        .merges_url
-        .as_ref()
-        .map(|url| url.to_string())
-        .unwrap_or_else(|| {
-            format!(
-                "{}/repos/{}/{}/merges",
-                base_github_url(),
-                repo.name().owner,
-                repo.name().name
-            )
-        });
+    let merge_url = format!("/repos/{}/{}/merges", repo.name().owner, repo.name().name);
 
     let request = MergeRequest {
         base: base_ref,
@@ -150,8 +137,7 @@ async fn update_branch(
     sha: &CommitSha,
 ) -> Result<(), BranchUpdateError> {
     let url = format!(
-        "{}/repos/{}/{}/git/refs/{}",
-        base_github_url(),
+        "/repos/{}/{}/git/refs/{}",
         repo.name().owner(),
         repo.name().name(),
         Reference::Branch(branch_name.clone()).ref_url()