README.md

@@ -16,10 +16,8 @@ Runboat has the following main components:
 - An in-memory database of deployed builds, with their current status.
 - A REST API to list builds and trigger new deployments as well as start, stop, redeploy
   or undeploy builds.
-- A git forge webhook to automatically trigger new builds on pushes to branches and pull
+- A GitHub webhook to automatically trigger new builds on pushes to branches and pull
   requests of supported repositories and branches (configured via regular expressions).
-  GitHub is the default; Forgejo/Gitea and other GitHub-compatible forges are supported
-  via `RUNBOAT_FORGE_API_BASE_URL` and `RUNBOAT_FORGE_WEB_BASE_URL`.
 - A controller that performs the following tasks:
 
   - monitor deployments in a kubernetes namespaces to maintain the in-memory database;

src/runboat/github.py

@@ -13,7 +13,7 @@ _logger = logging.getLogger(__name__)
 
 async def _github_request(method: str, url: str, json: Any = None) -> Any:
     async with httpx.AsyncClient() as client:
-        full_url = f"{settings.forge_api_base_url}{url}"
+        full_url = f"https://api.github.com{url}"
         headers = {
             "Accept": "application/vnd.github.v3+json",
         }
@@ -21,7 +21,7 @@ async def _github_request(method: str, url: str, json: Any = None) -> Any:
             headers["Authorization"] = f"token {settings.github_token}"
         response = await client.request(method, full_url, headers=headers, json=json)
         if response.status_code == 404:
-            raise NotFoundOnGitHub(f"Forge URL not found: {full_url}.")
+            raise NotFoundOnGitHub(f"GitHub URL not found: {full_url}.")
         response.raise_for_status()
         return response.json()
 

src/runboat/models.py

@@ -141,22 +141,23 @@ class Build(BaseModel):
     @property
     def repo_target_branch_link(self) -> str:
         return (
-            f"{settings.forge_web_base_url}/{self.commit_info.repo}"
-            f"/src/branch/{self.commit_info.target_branch}"
+            f"https://github.com/{self.commit_info.repo}"
+            f"/tree/{self.commit_info.target_branch}"
         )
 
     @property
     def repo_pr_link(self) -> str | None:
         if not self.commit_info.pr:
             return None
-        return f"{settings.forge_web_base_url}/{self.commit_info.repo}/pulls/{self.commit_info.pr}"
+        return f"https://github.com/{self.commit_info.repo}/pull/{self.commit_info.pr}"
 
     @property
     def repo_commit_link(self) -> str:
-        link = f"{settings.forge_web_base_url}/{self.commit_info.repo}"
+        link = f"https://github.com/{self.commit_info.repo}"
         if self.commit_info.pr:
             return (
-                f"{link}/pulls/{self.commit_info.pr}"
+                f"{link}/pull/{self.commit_info.pr}"
+                f"/commits/{self.commit_info.git_commit}"
             )
         else:
             return f"{link}/commit/{self.commit_info.git_commit}"
@@ -417,4 +418,4 @@ class Repo(BaseModel):
 
     @property
     def link(self) -> str:
-        return f"{settings.forge_web_base_url}/{self.name}"
+        return f"https://github.com/{self.name}"

src/runboat/settings.py

@@ -70,17 +70,10 @@ class Settings(BaseSettings):
     build_default_kubefiles_path: Annotated[
         Path | None, BeforeValidator(validate_path)
     ] = None
-    # The base URL of the git forge API (e.g. https://api.github.com for GitHub,
-    # or https://git.example.com/api/v1 for Forgejo/Gitea).
-    # Defaults to the GitHub API for backwards compatibility.
-    forge_api_base_url: str = "https://api.github.com"
-    # The base URL of the git forge web UI (e.g. https://github.com for GitHub,
-    # or https://git.example.com for Forgejo/Gitea).
-    forge_web_base_url: str = "https://github.com"
-    # The token to use for the git forge API calls (to query branches and pull
-    # requests, and report build statuses).
+    # The token to use for the GitHub api calls (to query branches and pull requests,
+    # and report build statuses).
     github_token: str | None = None
-    # The secret used to verify git forge webhook signatures (X-Hub-Signature-256).
+    # The secret used to verify GitHub webhook signatures
     github_webhook_secret: bytes | None = None
     # The file with the python logging configuration to use for the runboat controller.
     log_config: str | None = None