merge master into dana/trvis-ci

Author: dana-yaish

.github/workflows/ci.yml

@@ -48,11 +48,8 @@ jobs:
         pytest --cov
     - name: Dogfooding codecov-cli. Use codecov-cli to upload to codecov
       run: |
-        codecovcli --auto-load-params-from githubactions do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10
-    - name: Upload to codecov
-      run: |
-        pip install codecov
-        codecov -t ${{ secrets.CODECOV_TOKEN }} -F python3.10
+        codecovcli do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10
+
 
 
   create_release:

.github/workflows/python-package.yml

@@ -50,10 +50,10 @@ jobs:
         pytest --cov
     - name: Dogfooding codecov-cli. Use codecov-cli to upload to codecov
       run: |
-        codecovcli --auto-load-params-from githubactions do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10
-    - name: Upload to codecov
-      run: |
-        pip install codecov
-        codecov -t ${{ secrets.CODECOV_TOKEN }} -F python3.10
+        codecovcli do-upload -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag cli3.10 --flag python3.10
+    # - name: Upload to codecov
+    #   run: |
+    #     pip install codecov
+    #     codecov -t ${{ secrets.CODECOV_TOKEN }} -F python3.10
 
 

codecov_cli/commands/upload.py

@@ -18,7 +18,10 @@ def _turn_env_vars_into_dict(ctx, params, value):
 
 @click.command()
 @click.option(
+    "-C",
+    "--sha",
     "--commit-sha",
+    "commit_sha",
     help="Commit SHA (with 40 chars)",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.commit_sha,
@@ -37,13 +40,17 @@ def _turn_env_vars_into_dict(ctx, params, value):
     show_default="Current working directory",
 )
 @click.option(
+    "-s",
+    "--dir",
     "--coverage-files-search-root-folder",
+    "coverage_files_search_root_folder",
     help="Folder where to search for coverage files",
     type=click.Path(path_type=pathlib.Path),
     default=pathlib.Path.cwd,
     show_default="Current Working Directory",
 )
 @click.option(
+    "--exclude",
     "--coverage-files-search-exclude-folder",
     "coverage_files_search_exclude_folders",
     help="Folders where to search for coverage files",
@@ -52,6 +59,8 @@ def _turn_env_vars_into_dict(ctx, params, value):
     default=None,
 )
 @click.option(
+    "-f",
+    "--file",
     "--coverage-files-search-direct-file",
     "coverage_files_search_explicitly_listed_files",
     help="Explicit files to upload",
@@ -60,12 +69,17 @@ def _turn_env_vars_into_dict(ctx, params, value):
     default=None,
 )
 @click.option(
+    "-b",
+    "--build",
     "--build-code",
+    "build_code",
     cls=CodecovOption,
+    help="Specify the build number manually",
     fallback_field=FallbackFieldEnum.build_code,
 )
 @click.option(
     "--build-url",
+    "build_url",
     cls=CodecovOption,
     help="The URL of the build where this is running",
     fallback_field=FallbackFieldEnum.build_url,
@@ -95,20 +109,40 @@ def _turn_env_vars_into_dict(ctx, params, value):
     fallback_field=FallbackFieldEnum.branch,
 )
 @click.option(
+    "-r",
     "--slug",
+    "slug",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.slug,
     help="owner/repo slug used instead of the private repo token in Self-hosted",
     envvar="CODECOV_SLUG",
 )
 @click.option(
+    "-P",
+    "--pr",
     "--pull-request-number",
+    "pull_request_number",
     help="Specify the pull request number mannually. Used to override pre-existing CI environment variables",
     cls=CodecovOption,
     fallback_field=FallbackFieldEnum.pull_request_number,
 )
-@click.option("--env-var", "env_vars", multiple=True, callback=_turn_env_vars_into_dict)
-@click.option("--flag", "flags", multiple=True, default=[])
+@click.option(
+    "-e",
+    "--env",
+    "--env-var",
+    "env_vars",
+    multiple=True,
+    callback=_turn_env_vars_into_dict,
+    help="Specify environment variables to be included with this build.",
+)
+@click.option(
+    "-F",
+    "--flag",
+    "flags",
+    multiple=True,
+    default=[],
+    help="Flag the upload to group coverage metrics. Multiple flags allowed.",
+)
 @click.option(
     "--plugin", "plugin_names", multiple=True, default=["xcode", "gcov", "pycoverage"]
 )

codecov_cli/helpers/ci_adapters/__init__.py

@@ -1,22 +1,84 @@
+import logging
+
 from codecov_cli.helpers.ci_adapters.appveyor_ci import AppveyorCIAdapter
+from codecov_cli.helpers.ci_adapters.azure_pipelines import AzurePipelinesCIAdapter
+from codecov_cli.helpers.ci_adapters.bitbucket_ci import BitbucketAdapter
+from codecov_cli.helpers.ci_adapters.bitrise_ci import BitriseCIAdapter
+from codecov_cli.helpers.ci_adapters.buildkite import BuildkiteAdapter
 from codecov_cli.helpers.ci_adapters.circleci import CircleCICIAdapter
+from codecov_cli.helpers.ci_adapters.cirrus_ci import CirrusCIAdapter
+from codecov_cli.helpers.ci_adapters.droneci import DroneCIAdapter
 from codecov_cli.helpers.ci_adapters.github_actions import GithubActionsCIAdapter
 from codecov_cli.helpers.ci_adapters.gitlab_ci import GitlabCIAdapter
 from codecov_cli.helpers.ci_adapters.heroku import HerokuCIAdapter
 from codecov_cli.helpers.ci_adapters.travis_ci import TravisCIAdapter
+from codecov_cli.helpers.ci_adapters.jenkins import JenkinsAdapter
+from codecov_cli.helpers.ci_adapters.local import LocalAdapter
+from codecov_cli.helpers.ci_adapters.teamcity import TeamcityAdapter
+from codecov_cli.helpers.ci_adapters.woodpeckerci import WoodpeckerCIAdapter
+
+logger = logging.getLogger("codecovcli")
 
 
-def get_ci_adapter(provider_name):
-    if provider_name == "circleci":
-        return CircleCICIAdapter()
-    if provider_name == "githubactions":
-        return GithubActionsCIAdapter()
-    if provider_name == "gitlabCI":
-        return GitlabCIAdapter()
-    if provider_name == "appveyor":
-        return AppveyorCIAdapter()
-    if provider_name == "heroku":
-        return HerokuCIAdapter()
-    if provider_name == "travis":
-        return TravisCIAdapter()
+def get_ci_adapter(provider_name: str = None):
+    if provider_name:
+        if provider_name == "circleci":
+            return CircleCICIAdapter()
+        if provider_name == "githubactions":
+            return GithubActionsCIAdapter()
+        if provider_name == "gitlabCI":
+            return GitlabCIAdapter()
+        if provider_name == "bitbucket":
+            return BitbucketAdapter()
+        if provider_name == "bitrise":
+            return BitriseCIAdapter()
+        if provider_name == "appveyor":
+            return AppveyorCIAdapter()
+        if provider_name == "local":
+            return LocalAdapter()
+        if provider_name == "woodpecker":
+            return WoodpeckerCIAdapter()
+        if provider_name == "teamcity":
+            return TeamcityAdapter()
+        if provider_name == "heroku":
+            return HerokuCIAdapter()
+        if provider_name == "droneci":
+            return DroneCIAdapter()
+        if provider_name == "buildkite":
+            return BuildkiteAdapter()
+        if provider_name == "azurepipelines":
+            return AzurePipelinesCIAdapter()
+        if provider_name == "jenkins":
+            return JenkinsAdapter()
+        if provider_name == "cirrusci":
+            return CirrusCIAdapter()
+        if provider_name == "travis":
+            return TravisCIAdapter()
+    else:
+        for provider in get_ci_providers_list():
+            if provider.detect():
+                logger.info(f"Found ci service {provider._get_service()}")
+                return provider
     return None
+
+
+def get_ci_providers_list():
+    return [
+        CircleCICIAdapter(),
+        GithubActionsCIAdapter(),
+        GitlabCIAdapter(),
+        BitbucketAdapter(),
+        BitriseCIAdapter(),
+        AppveyorCIAdapter(),
+        WoodpeckerCIAdapter(),
+        HerokuCIAdapter(),
+        DroneCIAdapter(),
+        BuildkiteAdapter(),
+        AzurePipelinesCIAdapter(),
+        JenkinsAdapter(),
+        CirrusCIAdapter(),
+        TeamcityAdapter(),
+        TravisCIAdapter(),
+        # local adapter should always be the last one
+        LocalAdapter(),
+    ]

codecov_cli/helpers/ci_adapters/appveyor_ci.py

@@ -4,6 +4,11 @@
 
 
 class AppveyorCIAdapter(CIAdapterBase):
+    # https://www.appveyor.com/docs/environment-variables/
+
+    def detect(self) -> bool:
+        return bool(os.getenv("CI")) and bool(os.getenv("APPVEYOR"))
+
     def _get_commit_sha(self):
         return os.getenv("APPVEYOR_PULL_REQUEST_HEAD_COMMIT") or os.getenv(
             "APPVEYOR_REPO_COMMIT"
@@ -44,3 +49,6 @@ def _get_branch(self):
 
     def _get_service(self):
         return "appveyor"
+
+    def get_service_name(self):
+        return "AppVeyor"

codecov_cli/helpers/ci_adapters/azure_pipelines.py

@@ -0,0 +1,42 @@
+import os
+
+from codecov_cli.helpers.ci_adapters.base import CIAdapterBase
+
+
+class AzurePipelinesCIAdapter(CIAdapterBase):
+    # https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services
+
+    def detect(self) -> bool:
+        return bool(os.getenv("SYSTEM_TEAMFOUNDATIONCOLLECTIONURI"))
+
+    def _get_commit_sha(self):
+        return os.getenv("BUILD_SOURCEVERSION")
+
+    def _get_build_url(self):
+        if os.getenv("SYSTEM_TEAMPROJECT") and os.getenv("BUILD_BUILDID"):
+            return f'{os.getenv("SYSTEM_TEAMFOUNDATIONCOLLECTIONURI")}{os.getenv("SYSTEM_TEAMPROJECT")}/_build/results?buildId={os.getenv("BUILD_BUILDID")}'
+
+    def _get_build_code(self):
+        return os.getenv("BUILD_BUILDNUMBER")
+
+    def _get_job_code(self):
+        return os.getenv("BUILD_BUILDID")
+
+    def _get_pull_request_number(self):
+        return os.getenv("SYSTEM_PULLREQUEST_PULLREQUESTNUMBER") or os.getenv(
+            "SYSTEM_PULLREQUEST_PULLREQUESTID"
+        )
+
+    def _get_slug(self):
+        return os.getenv("BUILD_REPOSITORY_NAME")
+
+    def _get_branch(self):
+        branch = os.getenv("BUILD_SOURCEBRANCH")
+        if branch:
+            return branch.replace("refs/heads/", "")
+
+    def _get_service(self):
+        return "azure_pipelines"
+
+    def get_service_name(self):
+        return "AzurePipelines"

codecov_cli/helpers/ci_adapters/bitbucket_ci.py

@@ -4,6 +4,11 @@
 
 
 class BitbucketAdapter(CIAdapterBase):
+    # https://support.atlassian.com/bitbucket-cloud/docs/variables-and-secrets/
+
+    def detect(self) -> bool:
+        return bool(os.getenv("CI")) and bool(os.getenv("BITBUCKET_BUILD_NUMBER"))
+
     def _get_commit_sha(self):
         commit = os.getenv("BITBUCKET_COMMIT")
 
@@ -32,3 +37,6 @@ def _get_branch(self):
 
     def _get_service(self):
         return "bitbucket"
+
+    def get_service_name(self):
+        return "Bitbucket"

codecov_cli/helpers/ci_adapters/bitrise_ci.py

@@ -4,6 +4,11 @@
 
 
 class BitriseCIAdapter(CIAdapterBase):
+    # https://devcenter.bitrise.io/en/references/available-environment-variables.html
+
+    def detect(self) -> bool:
+        return bool(os.getenv("CI")) and bool(os.getenv("BITRISE_IO"))
+
     def _get_commit_sha(self):
         return os.getenv("GIT_CLONE_COMMIT_HASH")
 
@@ -27,3 +32,6 @@ def _get_branch(self):
 
     def _get_service(self):
         return "bitrise"
+
+    def get_service_name(self):
+        return "Bitrise"

codecov_cli/helpers/ci_adapters/buildkite.py

@@ -0,0 +1,45 @@
+import os
+
+from codecov_cli.helpers.ci_adapters.base import CIAdapterBase
+
+
+class BuildkiteAdapter(CIAdapterBase):
+    # https://buildkite.com/docs/pipelines/environment-variables
+
+    def detect(self) -> bool:
+        return bool(os.getenv("BUILDKITE"))
+
+    def _get_branch(self):
+        return os.getenv("BUILDKITE_BRANCH")
+
+    def _get_build_code(self):
+        return os.getenv("BUILDKITE_BUILD_NUMBER")
+
+    def _get_build_url(self):
+        return os.getenv("BUILDKITE_BUILD_URL")
+
+    def _get_commit_sha(self):
+        return os.getenv("BUILDKITE_COMMIT")
+
+    def _get_slug(self):
+        org = os.getenv("BUILDKITE_ORGANIZATION_SLUG")
+        repo = os.getenv("BUILDKITE_PIPELINE_SLUG")
+        if org and repo:
+            return f"{org}/{repo}"
+        return None
+
+    def _get_service(self):
+        return "buildkite"
+
+    def _get_pull_request_number(self):
+        pr_number = os.getenv("BUILDKITE_PULL_REQUEST")
+        # The number of the pull request, if this branch is a pull request.
+        if pr_number != "false":
+            return pr_number
+        return None
+
+    def _get_job_code(self):
+        return os.getenv("BUILDKITE_JOB_ID")
+
+    def get_service_name(self):
+        return "BuildKite"

codecov_cli/helpers/ci_adapters/circleci.py

@@ -5,6 +5,8 @@
 
 class CircleCICIAdapter(CIAdapterBase):
     # https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
+    def detect(self) -> bool:
+        return bool(os.getenv("CI")) and bool(os.getenv("CIRCLECI"))
 
     def _get_commit_sha(self):
         return os.getenv("CIRCLE_SHA1")
@@ -40,3 +42,6 @@ def _get_branch(self):
 
     def _get_service(self):
         return "circleci"
+
+    def get_service_name(self):
+        return "CircleCI"