From 559ad465fec1d4ae7994486d6225b1ae643d13c1 Mon Sep 17 00:00:00 2001
From: Valentin Rigal <rigal@teklia.com>
Date: Wed, 11 Mar 2026 12:08:53 +0100
Subject: [PATCH 1/3] Support Github revision with backend generic provider

---
 bot/code_review_bot/__init__.py              | 44 ++++-----
 bot/code_review_bot/backend.py               | 57 +++++-------
 bot/code_review_bot/cli.py                   | 15 +++-
 bot/code_review_bot/config.py                | 10 +++
 bot/code_review_bot/revisions/__init__.py    |  3 +-
 bot/code_review_bot/revisions/base.py        | 39 ++++++--
 bot/code_review_bot/revisions/github.py      | 93 ++++++++++++++++++++
 bot/code_review_bot/revisions/phabricator.py | 41 ++++++++-
 bot/code_review_bot/workflow.py              | 36 ++++++--
 9 files changed, 259 insertions(+), 79 deletions(-)
 create mode 100644 bot/code_review_bot/revisions/github.py

diff --git a/bot/code_review_bot/__init__.py b/bot/code_review_bot/__init__.py
index 1bfe0c0f8..2c8d2b79c 100644
--- a/bot/code_review_bot/__init__.py
+++ b/bot/code_review_bot/__init__.py
@@ -191,41 +191,29 @@ def hash(self):
         We make the assumption that the message does not contain the line number
         If an error occurs reading the file content (locally or remotely), None is returned
         """
+        from code_review_bot.revisions import GithubRevision, PhabricatorRevision
+
         assert self.revision is not None, "Missing revision"
 
+        local_repository = None
+        if isinstance(self.revision, PhabricatorRevision):
+            if settings.mercurial_cache_checkout:
+                local_repository = settings.mercurial_cache_checkout
+        elif isinstance(self.revision, GithubRevision):
+            assert (
+                settings.github_cache
+            ), "Github cache repository is mandatory to analyse a github revision"
+            local_repository = settings.github_cache
+        else:
+            raise Exception(self.revision.__class__)
+            raise NotImplementedError
+
         # Build the hash only if the file is not autogenerated.
         # An autogenerated file resides in the build directory that it has the
         #  format `obj-x86_64-pc-linux-gnu`
         file_content = None
         if "/obj-" not in self.path:
-            if settings.mercurial_cache_checkout:
-                logger.debug("Using the local repository to build issue's hash")
-                try:
-                    with (settings.mercurial_cache_checkout / self.path).open() as f:
-                        file_content = f.read()
-                except (FileNotFoundError, IsADirectoryError):
-                    logger.warning(
-                        "Failed to find issue's related file", path=self.path
-                    )
-                    file_content = None
-            else:
-                try:
-                    # Load all the lines affected by the issue
-                    file_content = self.revision.load_file(self.path)
-                except ValueError:
-                    # Build the hash with an empty content in case the path is erroneous
-                    file_content = None
-                except requests.exceptions.HTTPError as e:
-                    if e.response.status_code == 404:
-                        logger.warning(
-                            "Failed to download a file with an issue", path=self.path
-                        )
-
-                        # We still build the hash with empty content
-                        file_content = None
-                    else:
-                        # When encountering another HTTP error, raise the issue
-                        raise
+            file_content = self.revision.get_file_content(self.path, local_repository)
 
         if file_content is None:
             self._hash = None
diff --git a/bot/code_review_bot/backend.py b/bot/code_review_bot/backend.py
index 17019b5b3..7a81c6c9a 100644
--- a/bot/code_review_bot/backend.py
+++ b/bot/code_review_bot/backend.py
@@ -9,6 +9,7 @@
 
 from code_review_bot import taskcluster
 from code_review_bot.config import GetAppUserAgent, settings
+from code_review_bot.revisions import PhabricatorRevision
 from code_review_bot.tasks.lint import MozLintIssue
 
 logger = structlog.get_logger(__name__)
@@ -46,38 +47,31 @@ def publish_revision(self, revision):
             logger.warn("Skipping revision publication on backend")
             return
 
-        # Check the repositories are urls
-        for url in (revision.base_repository, revision.head_repository):
-            assert isinstance(url, str), "Repository must be a string"
-            res = urllib.parse.urlparse(url)
-            assert res.scheme and res.netloc, f"Repository {url} is not an url"
-
-        # Check the Mercurial changesets are strings
-        for changeset in (
-            revision.base_changeset,
-            revision.head_changeset,
-        ):
-            assert isinstance(changeset, str), "Mercurial changeset must be a string"
-
-        # Create revision on backend if it does not exists
-        data = {
-            "phabricator_id": revision.phabricator_id,
-            "phabricator_phid": revision.phabricator_phid,
-            "title": revision.title,
-            "bugzilla_id": revision.bugzilla_id,
-            "base_repository": revision.base_repository,
-            "head_repository": revision.head_repository,
-            "base_changeset": revision.base_changeset,
-            "head_changeset": revision.head_changeset,
-        }
-
-        # Try to create the revision, or retrieve it in case it exists with that Phabricator ID.
+        elif isinstance(revision, PhabricatorRevision):
+            # Check the repositories are urls
+            for url in (revision.base_repository, revision.head_repository):
+                assert isinstance(url, str), "Repository must be a string"
+                res = urllib.parse.urlparse(url)
+                assert res.scheme and res.netloc, f"Repository {url} is not an url"
+
+            # Check the Mercurial changesets are strings
+            for changeset in (
+                revision.base_changeset,
+                revision.head_changeset,
+            ):
+                assert isinstance(
+                    changeset, str
+                ), "Mercurial changeset must be a string"
+
+        revision_data, diff_data = revision.serialize()
+
+        # Try to create the revision, or retrieve it in case it exists with that provider and ID.
         # The backend always returns a revisions, either a new one, or a pre-existing one
         revision_url = "/v1/revision/"
         auth = (self.username, self.password)
         url_post = urllib.parse.urljoin(self.url, revision_url)
         response = requests.post(
-            url_post, headers=GetAppUserAgent(), json=data, auth=auth
+            url_post, headers=GetAppUserAgent(), json=revision_data, auth=auth
         )
         if not response.ok:
             logger.warn(f"Backend rejected the payload: {response.content}")
@@ -87,17 +81,14 @@ def publish_revision(self, revision):
         revision.issues_url = backend_revision["issues_bulk_url"]
         revision.id = backend_revision["id"]
 
-        # A revision may have no diff (e.g. Mozilla-central group tasks)
-        if not revision.diff_id:
+        # A revision may have no diff (e.g. Phabricator Mozilla-central group tasks)
+        if isinstance(revision, PhabricatorRevision) and not revision.diff_id:
             return backend_revision
 
         # Create diff attached to revision on backend
         data = {
-            "id": revision.diff_id,
-            "phid": revision.diff_phid,
+            **diff_data,
             "review_task_id": settings.taskcluster.task_id,
-            "mercurial_hash": revision.head_changeset,
-            "repository": revision.head_repository,
         }
         backend_diff = self.create(backend_revision["diffs_url"], data)
 
diff --git a/bot/code_review_bot/cli.py b/bot/code_review_bot/cli.py
index 6e2a9a875..8f590f6a0 100644
--- a/bot/code_review_bot/cli.py
+++ b/bot/code_review_bot/cli.py
@@ -26,7 +26,7 @@
 )
 from code_review_bot.config import settings
 from code_review_bot.report import get_reporters
-from code_review_bot.revisions import PhabricatorRevision, Revision
+from code_review_bot.revisions import GithubRevision, PhabricatorRevision, Revision
 from code_review_bot.tools.libmozdata import setup as setup_libmozdata
 from code_review_bot.tools.log import init_logger
 from code_review_bot.workflow import Workflow
@@ -64,6 +64,13 @@ def parse_cli():
         type=Path,
         default=None,
     )
+    parser.add_argument(
+        "--github-repository",
+        help="Optional path to a up-to-date github repository matching the analyzed revision.\n"
+        "This argument is required for Github reviusions in order to compute issues' hashes based on file content.",
+        type=Path,
+        default=None,
+    )
     parser.add_argument("--taskcluster-client-id", help="Taskcluster Client ID")
     parser.add_argument("--taskcluster-access-token", help="Taskcluster Access token")
     return parser.parse_args()
@@ -116,6 +123,7 @@ def main():
         taskcluster.secrets["repositories"],
         taskcluster.secrets["ssh_key"],
         args.mercurial_repository,
+        args.github_repository,
     )
 
     # Setup statistics
@@ -205,6 +213,11 @@ def main():
             )
             return 1
 
+    if isinstance(revision, GithubRevision):
+        assert (
+            args.github_repository is not None
+        ), "Girhub revision analysis requires the --github-repository argument to be set"
+
     # Run workflow according to source
     w = Workflow(
         reporters,
diff --git a/bot/code_review_bot/config.py b/bot/code_review_bot/config.py
index c571aa3ef..dfa54b2cb 100644
--- a/bot/code_review_bot/config.py
+++ b/bot/code_review_bot/config.py
@@ -58,6 +58,7 @@ def __init__(self):
 
         # Cache to store whole repositories
         self.mercurial_cache = None
+        self.github_cache = None
 
         # SSH Key used to push on try
         self.ssh_key = None
@@ -78,6 +79,7 @@ def setup(
         repositories,
         ssh_key=None,
         mercurial_cache=None,
+        github_cache=None,
     ):
         # Detect source from env
         if "TRY_TASK_ID" in os.environ and "TRY_TASK_GROUP_ID" in os.environ:
@@ -148,6 +150,14 @@ def build_conf(nb, repo):
             # Save ssh key when mercurial cache is enabled
             self.ssh_key = ssh_key
 
+        # Store github cache path
+        if github_cache is not None:
+            self.github_cache = Path(github_cache)
+            assert (
+                self.github_cache.exists()
+            ), f"Github cache does not exist {self.github_cache}"
+            logger.info("Using Github cache", path=self.mercurial_cache)
+
     def load_user_blacklist(self, usernames, phabricator_api):
         """
         Load all black listed users from Phabricator API
diff --git a/bot/code_review_bot/revisions/__init__.py b/bot/code_review_bot/revisions/__init__.py
index 10d4224fa..f98bd00a7 100644
--- a/bot/code_review_bot/revisions/__init__.py
+++ b/bot/code_review_bot/revisions/__init__.py
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from code_review_bot.revisions.base import ImprovementPatch, Revision
+from code_review_bot.revisions.github import GithubRevision
 from code_review_bot.revisions.phabricator import PhabricatorRevision
 
-__all__ = [ImprovementPatch, Revision, PhabricatorRevision]
+__all__ = [ImprovementPatch, Revision, PhabricatorRevision, GithubRevision]
diff --git a/bot/code_review_bot/revisions/base.py b/bot/code_review_bot/revisions/base.py
index 1cd319401..492b9a35a 100644
--- a/bot/code_review_bot/revisions/base.py
+++ b/bot/code_review_bot/revisions/base.py
@@ -6,6 +6,7 @@
 import random
 from abc import ABC
 from datetime import timedelta
+from pathlib import Path
 
 import rs_parsepatch
 import structlog
@@ -165,6 +166,25 @@ def contains(self, issue):
         lines = set(range(issue.line, issue.line + issue.nb_lines))
         return not lines.isdisjoint(modified_lines)
 
+    def get_file_content(
+        self, file_path: str, local_cache_repository: Path | None = None
+    ):
+        if local_cache_repository:
+            logger.debug("Using the local repository to build issue's hash")
+            try:
+                with (local_cache_repository / file_path).open() as f:
+                    file_content = f.read()
+            except (FileNotFoundError, IsADirectoryError):
+                logger.warning("Failed to find issue's related file", path=file_path)
+                file_content = None
+        else:
+            try:
+                file_content = self.load_file(file_path)
+            except ValueError:
+                # The path is erroneous, consider as empty content
+                file_content = None
+        return file_content
+
     @property
     def has_clang_files(self):
         """
@@ -237,17 +257,26 @@ def as_dict(self):
         """
         raise NotImplementedError
 
+    def serialize(self):
+        """
+        Outputs a tuple of dicts for revision and diff sent to backend
+        """
+        raise NotImplementedError
+
     @staticmethod
     def from_try_task(try_task: dict, decision_task: dict, phabricator: PhabricatorAPI):
         """
-        Load identifiers from Phabricator, using the remote task description
+        Load identifiers from Phabricator or Github, using the remote task description
         """
+        from code_review_bot.revisions.github import GithubRevision
         from code_review_bot.revisions.phabricator import PhabricatorRevision
 
         # Load build target phid from the task env
         code_review = try_task["extra"]["code-review"]
 
-        # TODO: support github revision here too
-        return PhabricatorRevision.from_try_task(
-            code_review, decision_task, phabricator
-        )
+        if "github" in code_review:
+            return GithubRevision(**code_review["github"])
+        else:
+            return PhabricatorRevision.from_try_task(
+                code_review, decision_task, phabricator
+            )
diff --git a/bot/code_review_bot/revisions/github.py b/bot/code_review_bot/revisions/github.py
new file mode 100644
index 000000000..8e96fc3d7
--- /dev/null
+++ b/bot/code_review_bot/revisions/github.py
@@ -0,0 +1,93 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from urllib.parse import urlparse
+
+import requests
+import structlog
+
+from code_review_bot.revisions import Revision
+
+logger = structlog.get_logger(__name__)
+
+
+class GithubRevision(Revision):
+    """
+    A revision from a github pull-request
+    """
+
+    def __init__(self, repo_url, branch, pull_number, pull_head_sha):
+        super().__init__()
+
+        self.repo_url = repo_url
+        self.branch = branch
+        self.pull_number = pull_number
+        self.pull_head_sha = pull_head_sha
+
+        # Load the patch from Github
+        self.patch = self.load_patch()
+
+    def __str__(self):
+        return f"Github pull request {self.repo_url} #{self.pull_number} ({self.pull_head_sha[:8]})"
+
+    def __repr__(self):
+        return f"GithubRevision repo_url={self.repo_url} branch={self.branch} pull_number={self.pull_number} sha={self.pull_head_sha}"
+
+    @property
+    def repo_name(self):
+        """
+        Extract the name of the repository from its URL
+        """
+        return urlparse(self.repo_url).path.strip("/")
+
+    @property
+    def repository_slug(self):
+        """
+        Generate a slug from the Github repository.
+        This method copies the automatic slug creation in backend's RepositoryGetOrCreateField serializer field.
+        """
+        base_repo_url = self.pull_request.base.repo.html_url
+        parsed = urlparse(base_repo_url)
+        return parsed.path.lstrip("/").replace("/", "-")
+
+    def load_patch(self):
+        """
+        Load the patch content for the current pull request HEAD
+        """
+        # TODO: use specific sha
+        url = f"{self.repo_url}/pull/{self.pull_number}.diff"
+        logger.info("Loading github patch", url=url)
+        resp = requests.get(url, allow_redirects=True)
+        resp.raise_for_status()
+        return resp.content.decode()
+
+    def as_dict(self):
+        return {
+            "repo_url": self.repo_url,
+            "branch": self.branch,
+            "pull_number": self.pull_number,
+            "pull_head_sha": self.pull_head_sha,
+        }
+
+    def serialize(self):
+        """
+        Outputs a tuple of dicts for revision and diff (empty for Github) sent to backend
+        """
+        revision = {
+            "provider": "github",
+            "provider_id": self.pull_number,
+            # TODO: Use the pull request information from the API
+            "title": f"Issue {self.pull_number}",
+            "bugzilla_id": None,
+            # TODO: Use the pull request information from the API
+            "base_repository": self.repo_url,
+            "head_repository": self.repo_url,
+        }
+        diff = {
+            "provider": "github",
+            "provider_id": self.pull_head_sha,
+            "mercurial_hash": self.pull_head_sha,
+            "repository": self.repo_url,
+        }
+        return revision, diff
diff --git a/bot/code_review_bot/revisions/phabricator.py b/bot/code_review_bot/revisions/phabricator.py
index 8970e19ae..975268600 100644
--- a/bot/code_review_bot/revisions/phabricator.py
+++ b/bot/code_review_bot/revisions/phabricator.py
@@ -130,12 +130,13 @@ def __str__(self):
         return f"Phabricator #{self.diff_id} - {self.diff_phid}"
 
     @staticmethod
-    def from_try_task(try_task: dict, decision_task: dict, phabricator: PhabricatorAPI):
+    def from_try_task(
+        code_review: dict, decision_task: dict, phabricator: PhabricatorAPI
+    ):
         """
         Load identifiers from Phabricator, using the remote task description
         """
         # Load build target phid from the task env
-        code_review = try_task["extra"]["code-review"]
         build_target_phid = code_review.get("phabricator-diff") or code_review.get(
             "phabricator-build-target"
         )
@@ -361,8 +362,17 @@ def load_file(self, path):
         )
         logger.info("Downloading HGMO file", url=url)
 
-        response = requests.get(url, headers=GetAppUserAgent())
-        response.raise_for_status()
+        try:
+            response = requests.get(url, headers=GetAppUserAgent())
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as e:
+            if e.response.status_code == 404:
+                logger.warning("Failed to download file", path=self.path)
+                # Consider as empty content if the file is not found
+                return None
+            else:
+                # When encountering another HTTP error, raise the issue
+                raise e
 
         # Store in cache
         content = response.content.decode("utf-8")
@@ -430,3 +440,26 @@ def as_dict(self):
             "head_changeset": self.head_changeset,
             "base_changeset": self.base_changeset,
         }
+
+    def serialize(self):
+        """
+        Outputs a tuple of dicts for revision and diff sent to backend
+        """
+        revision = {
+            "provider": "phabricator",
+            "provider_id": self.phabricator_id,
+            "title": self.title,
+            "bugzilla_id": self.bugzilla_id,
+            "base_repository": self.base_repository,
+            "head_repository": self.head_repository,
+            "base_changeset": self.base_changeset,
+            "head_changeset": self.head_changeset,
+        }
+        diff = {
+            "id": self.diff_id,
+            "provider_id": self.diff_phid,
+            "mercurial_hash": self.head_changeset,
+            "repository": self.head_repository,
+        }
+
+        return revision, diff
diff --git a/bot/code_review_bot/workflow.py b/bot/code_review_bot/workflow.py
index 260a638e3..d398abec6 100644
--- a/bot/code_review_bot/workflow.py
+++ b/bot/code_review_bot/workflow.py
@@ -20,7 +20,7 @@
 from code_review_bot.config import settings
 from code_review_bot.mercurial import MercurialWorker, Repository, robust_checkout
 from code_review_bot.report.debug import DebugReporter
-from code_review_bot.revisions import PhabricatorRevision, Revision
+from code_review_bot.revisions import GithubRevision, PhabricatorRevision, Revision
 from code_review_bot.sources.phabricator import (
     PhabricatorActions,
     PhabricatorBuildState,
@@ -133,7 +133,7 @@ def run(self, revision):
             self.clone_repository(revision)
 
             # Mark know issues to avoid publishing them on this patch
-            self.find_previous_issues(issues, base_rev_changeset)
+            self.find_previous_issues(revision, issues, base_rev_changeset)
             new_issues_count = sum(issue.new_issue for issue in issues)
             logger.info(
                 f"Found {new_issues_count} new issues (over {len(issues)} total detected issues)",
@@ -265,9 +265,11 @@ def start_analysis(self, revision):
             logger.warning("Blacklisted author, stopping there.")
             return
 
-        # Cannot run without mercurial cache configured
-        if not settings.mercurial_cache:
-            raise Exception("Mercurial cache must be configured to start analysis")
+        # Cannot run without either mercurial or github cache configured
+        if not settings.mercurial_cache and not settings.github_cache:
+            raise Exception(
+                "One of Mercurial cache or github cache must be configured to start analysis"
+            )
 
         # Cannot run without ssh key
         if not settings.ssh_key:
@@ -361,6 +363,12 @@ def clone_repository(self, revision):
         Clone the repo locally when configured
         On production this should use a Taskcluster cache
         """
+        if not isinstance(revision, PhabricatorRevision):
+            logger.info(
+                "Mercurial clone only supports Phabricator revisions, skipping."
+            )
+            return
+
         if not settings.mercurial_cache:
             logger.debug("Local clone not required")
             return
@@ -490,7 +498,7 @@ def index(self, revision, **kwargs):
                 },
             )
 
-    def find_previous_issues(self, issues, base_rev_changeset=None):
+    def find_previous_issues(self, revision, issues, base_rev_changeset=None):
         """
         Look for known issues in the backend matching the given list of issues
 
@@ -513,9 +521,17 @@ def find_previous_issues(self, issues, base_rev_changeset=None):
             base_revision_changeset=base_rev_changeset,
         )
 
+        if isinstance(revision, PhabricatorRevision):
+            repository_slug = "mozilla-central"
+        elif isinstance(revision, GithubRevision):
+            # TODO: Rely on the central repository for known issues
+            repository_slug = revision.repository_slug
+        else:
+            raise NotImplementedError
+
         for path, group_issues in issues_groups:
             known_issues = self.backend_api.list_repo_issues(
-                "mozilla-central",
+                repository_slug,
                 date=current_date,
                 revision_changeset=base_rev_changeset,
                 path=path,
@@ -678,6 +694,11 @@ def update_status(self, revision, state):
                 "Only Phabricator revisions are supported for now"
             )
         assert isinstance(state, BuildState)
+
+        # Skip github status update, as we rely on the github reporter for publication
+        if isinstance(revision, GithubRevision):
+            return
+
         if not revision.build_target_phid:
             logger.info(
                 "No build target found, skipping HarborMaster update", state=state.value
@@ -701,6 +722,7 @@ def publish_link(self, revision: Revision, slug: str, name: str, url: str):
             raise NotImplementedError(
                 "Only Phabricator revisions are supported for now"
             )
+
         if not revision.build_target_phid:
             logger.info(
                 "No build target found, skipping HarborMaster link creation",

From fde27108ae7d15a55171d1e12a146bcbcf88d30b Mon Sep 17 00:00:00 2001
From: Valentin Rigal <rigal@teklia.com>
Date: Wed, 11 Mar 2026 14:51:53 +0100
Subject: [PATCH 2/3] Update tests

---
 bot/tests/conftest.py                  |  6 +-
 bot/tests/test_backend.py              | 10 +--
 bot/tests/test_index.py                |  7 +--
 bot/tests/test_reporter_phabricator.py | 87 +++++++++++---------------
 4 files changed, 47 insertions(+), 63 deletions(-)

diff --git a/bot/tests/conftest.py b/bot/tests/conftest.py
index 9d75614dc..caa4ae7fa 100644
--- a/bot/tests/conftest.py
+++ b/bot/tests/conftest.py
@@ -332,10 +332,12 @@ def mock_revision(mock_phabricator, mock_try_task, mock_decision_task, mock_conf
     """
     Mock a mercurial revision
     """
-    from code_review_bot.revisions import PhabricatorRevision
+    from code_review_bot.revisions import PhabricatorRevision, Revision
 
     with mock_phabricator as api:
-        return PhabricatorRevision.from_try_task(mock_try_task, mock_decision_task, api)
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
+        return revision
 
 
 @pytest.fixture
diff --git a/bot/tests/test_backend.py b/bot/tests/test_backend.py
index e6cc07bba..8d3d922cc 100644
--- a/bot/tests/test_backend.py
+++ b/bot/tests/test_backend.py
@@ -37,8 +37,8 @@ def test_publication(mock_clang_tidy_issues, mock_revision, mock_backend, mock_h
     assert revisions[1] == {
         "bugzilla_id": 1234567,
         "id": 1,
-        "phabricator_id": 51,
-        "phabricator_phid": "PHID-DREV-zzzzz",
+        "provider": "phabricator",
+        "provider_id": 51,
         "title": "Static Analysis tests",
         "diffs_url": "http://code-review-backend.test/v1/revision/1/diffs/",
         "issues_bulk_url": "http://code-review-backend.test/v1/revision/1/issues/",
@@ -55,7 +55,7 @@ def test_publication(mock_clang_tidy_issues, mock_revision, mock_backend, mock_h
         "id": 42,
         "issues_url": "http://code-review-backend.test/v1/diff/42/issues/",
         "mercurial_hash": "deadbeef1234",
-        "phid": "PHID-DIFF-test",
+        "provider_id": "PHID-DIFF-test",
         "review_task_id": "local instance",
         "repository": "http://hgmo/test-try",
     }
@@ -132,8 +132,8 @@ def test_missing_bugzilla_id(mock_revision, mock_backend, mock_hgmo):
     assert revisions[1] == {
         "id": 1,
         "bugzilla_id": None,
-        "phabricator_id": 51,
-        "phabricator_phid": "PHID-DREV-zzzzz",
+        "provider": "phabricator",
+        "provider_id": 51,
         "title": "Static Analysis tests",
         "diffs_url": "http://code-review-backend.test/v1/revision/1/diffs/",
         "issues_bulk_url": "http://code-review-backend.test/v1/revision/1/issues/",
diff --git a/bot/tests/test_index.py b/bot/tests/test_index.py
index 768bf06d8..fa5e6c032 100644
--- a/bot/tests/test_index.py
+++ b/bot/tests/test_index.py
@@ -5,7 +5,7 @@
 from unittest import mock
 
 from code_review_bot.config import TaskCluster
-from code_review_bot.revisions import PhabricatorRevision
+from code_review_bot.revisions import PhabricatorRevision, Revision
 
 
 class MockPhabricatorRevision(PhabricatorRevision):
@@ -199,9 +199,8 @@ def test_index_from_try(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
 
     mock_workflow.index_service = mock.Mock()
     mock_config.taskcluster = TaskCluster("/tmp/dummy", "12345deadbeef", 0, False)
diff --git a/bot/tests/test_reporter_phabricator.py b/bot/tests/test_reporter_phabricator.py
index 9fa67ccea..cc9e88af6 100644
--- a/bot/tests/test_reporter_phabricator.py
+++ b/bot/tests/test_reporter_phabricator.py
@@ -13,7 +13,7 @@
 
 from code_review_bot import Level
 from code_review_bot.report.phabricator import PhabricatorReporter
-from code_review_bot.revisions import ImprovementPatch, PhabricatorRevision
+from code_review_bot.revisions import ImprovementPatch, PhabricatorRevision, Revision
 from code_review_bot.tasks.clang_format import ClangFormatIssue, ClangFormatTask
 from code_review_bot.tasks.clang_tidy import ClangTidyIssue, ClangTidyTask
 from code_review_bot.tasks.clang_tidy_external import (
@@ -270,9 +270,8 @@ def test_phabricator_clang_tidy(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "another_test.cpp": [41, 42, 43]
@@ -308,9 +307,8 @@ def test_phabricator_clang_format(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.cpp": [41, 42, 43],
@@ -352,9 +350,8 @@ def test_phabricator_mozlint(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "python/test.py": [41, 42, 43],
@@ -443,9 +440,8 @@ def test_phabricator_coverage(
     Test Phabricator reporter publication on a mock coverage issue
     """
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.txt": [0],
@@ -511,9 +507,8 @@ def raise_404(*args, **kwargs):
         raise HTTPError(response=resp_mock)
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.txt": [0],
@@ -547,9 +542,8 @@ def test_phabricator_clang_tidy_and_coverage(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.txt": [0],
@@ -673,9 +667,8 @@ def test_phabricator_analyzers(
         api.comment = unittest.mock.Mock(return_value=True)
 
         # Always use the same setup, only varies the analyzers
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {"test.cpp": [0, 41, 42, 43], "dom/test.cpp": [42]}
         revision.id = 52
         reporter = PhabricatorReporter(
@@ -759,9 +752,8 @@ def test_phabricator_clang_tidy_build_error(
     from code_review_bot import Level
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.cpp": [41, 42, 43]
@@ -819,9 +811,8 @@ def test_full_file(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "xx.cpp": [123, 124, 125]
@@ -883,9 +874,8 @@ def test_task_failures(mock_phabricator, phab, mock_try_task, mock_decision_task
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.id = 52
         reporter = PhabricatorReporter({"analyzers": ["clang-tidy"]}, api=api)
 
@@ -910,9 +900,8 @@ def test_extra_errors(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {"path/to/file.py": [1, 2, 3]}
         revision.files = ["path/to/file.py"]
         revision.id = 52
@@ -1003,9 +992,8 @@ def test_phabricator_notices(mock_phabricator, phab, mock_try_task, mock_decisio
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.rst": [41, 42, 43],
@@ -1053,9 +1041,8 @@ def test_phabricator_tgdiff(mock_phabricator, phab, mock_try_task, mock_decision
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.rst": [41, 42, 43],
@@ -1091,9 +1078,8 @@ def test_phabricator_external_tidy(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "another_test.cpp": [41, 42, 43]
@@ -1144,9 +1130,8 @@ def test_phabricator_newer_diff(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.txt": [0],
@@ -1224,9 +1209,8 @@ def test_phabricator_former_diff_comparison(
     """
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.txt": [0],
@@ -1374,9 +1358,8 @@ def test_phabricator_before_after_comment(
     mock_taskcluster_config.secrets = {"BEFORE_AFTER_RATIO": 1}
 
     with mock_phabricator as api:
-        revision = PhabricatorRevision.from_try_task(
-            mock_try_task, mock_decision_task, api
-        )
+        revision = Revision.from_try_task(mock_try_task, mock_decision_task, api)
+        assert isinstance(revision, PhabricatorRevision)
         revision.lines = {
             # Add dummy lines diff
             "test.txt": [0],

From eaa3e0f6b067666ea63d33cadc1ace67be5dbc0d Mon Sep 17 00:00:00 2001
From: Valentin Rigal <rigal@teklia.com>
Date: Wed, 11 Mar 2026 17:13:36 +0100
Subject: [PATCH 3/3] Github support fixes

---
 bot/code_review_bot/report/lando.py     | 6 ++++--
 bot/code_review_bot/revisions/github.py | 3 +--
 bot/code_review_bot/workflow.py         | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bot/code_review_bot/report/lando.py b/bot/code_review_bot/report/lando.py
index 21ed73771..331a012b0 100644
--- a/bot/code_review_bot/report/lando.py
+++ b/bot/code_review_bot/report/lando.py
@@ -31,9 +31,11 @@ def publish(self, issues, revision, task_failures, links, reviewers):
         Send an email to administrators
         """
         if not isinstance(revision, PhabricatorRevision):
-            raise NotImplementedError(
-                "Only Phabricator revisions are supported for now"
+            logger.warning(
+                "Lando publication only works with Phabricator revisions. Skipping.",
+                revision=revision,
             )
+            return
 
         assert (
             revision.phabricator_id and revision.phabricator_phid and revision.diff
diff --git a/bot/code_review_bot/revisions/github.py b/bot/code_review_bot/revisions/github.py
index 8e96fc3d7..66e8751af 100644
--- a/bot/code_review_bot/revisions/github.py
+++ b/bot/code_review_bot/revisions/github.py
@@ -47,8 +47,7 @@ def repository_slug(self):
         Generate a slug from the Github repository.
         This method copies the automatic slug creation in backend's RepositoryGetOrCreateField serializer field.
         """
-        base_repo_url = self.pull_request.base.repo.html_url
-        parsed = urlparse(base_repo_url)
+        parsed = urlparse(self.repo_url)
         return parsed.path.lstrip("/").replace("/", "-")
 
     def load_patch(self):
diff --git a/bot/code_review_bot/workflow.py b/bot/code_review_bot/workflow.py
index d398abec6..a02e87c69 100644
--- a/bot/code_review_bot/workflow.py
+++ b/bot/code_review_bot/workflow.py
@@ -689,10 +689,10 @@ def update_status(self, revision, state):
         """
         Update build status on HarborMaster
         """
-        if not isinstance(revision, PhabricatorRevision):
-            raise NotImplementedError(
-                "Only Phabricator revisions are supported for now"
-            )
+        if isinstance(revision, GithubRevision):
+            logger.warning("No Lando publication for Github yet")
+            return
+
         assert isinstance(state, BuildState)
 
         # Skip github status update, as we rely on the github reporter for publication