From d1f382d08f8db0143e92a4347df0df10c5caea91 Mon Sep 17 00:00:00 2001 From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com> Date: Sat, 12 Sep 2026 11:01:10 +0000 Subject: [PATCH] fix: prevent 'None' git service in CI uploads --- codecov_cli/helpers/ci_adapters/bitbucket_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/github_actions.py | 3 +++ codecov_cli/helpers/ci_adapters/gitlab_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/harness.py | 15 ++++++++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/codecov_cli/helpers/ci_adapters/bitbucket_ci.py b/codecov_cli/helpers/ci_adapters/bitbucket_ci.py index c2d23302d..da39ce8aa 100644 --- a/codecov_cli/helpers/ci_adapters/bitbucket_ci.py +++ b/codecov_cli/helpers/ci_adapters/bitbucket_ci.py @@ -38,5 +38,8 @@ def _get_branch(self): def _get_service(self): return "bitbucket" + def _get_git_service(self): + return "bitbucket" + def get_service_name(self): return "Bitbucket" diff --git a/codecov_cli/helpers/ci_adapters/github_actions.py b/codecov_cli/helpers/ci_adapters/github_actions.py index 14f6c9f62..97d5335c2 100644 --- a/codecov_cli/helpers/ci_adapters/github_actions.py +++ b/codecov_cli/helpers/ci_adapters/github_actions.py @@ -85,6 +85,9 @@ def remove_prefix(s: str, prefix: str) -> str: def _get_service(self): return "github-actions" + def _get_git_service(self): + return "github" + def get_service_name(self): return "GithubActions" diff --git a/codecov_cli/helpers/ci_adapters/gitlab_ci.py b/codecov_cli/helpers/ci_adapters/gitlab_ci.py index 0ce119a79..2421ee9e6 100644 --- a/codecov_cli/helpers/ci_adapters/gitlab_ci.py +++ b/codecov_cli/helpers/ci_adapters/gitlab_ci.py @@ -52,5 +52,8 @@ def _get_branch(self): def _get_service(self): return "gitlab" + def _get_git_service(self): + return "gitlab" + def get_service_name(self): return "GitlabCI" diff --git a/codecov_cli/helpers/ci_adapters/harness.py b/codecov_cli/helpers/ci_adapters/harness.py index 500c8b769..dfd283d2d 100644 --- a/codecov_cli/helpers/ci_adapters/harness.py +++ b/codecov_cli/helpers/ci_adapters/harness.py @@ -1,7 +1,7 @@ import os from codecov_cli.helpers.ci_adapters.base import CIAdapterBase -from codecov_cli.helpers.git import parse_slug +from codecov_cli.helpers.git import parse_git_service, parse_slug # https://developer.harness.io/docs/continuous-integration/troubleshoot-ci/ci-env-var/ @@ -45,6 +45,19 @@ def _get_slug(self): return slug return None + def _get_git_service(self): + for env_var in ( + "CI_REPO_REMOTE", + "CI_REMOTE_URL", + "CI_REPO_LINK", + "DRONE_GIT_HTTP_URL", + "DRONE_REMOTE_URL", + ): + if url := os.getenv(env_var): + if service := parse_git_service(url): + return service + return None + def _get_service(self): return "harness"