Merge remote-tracking branch 'upstream/main' into arm64

cibuildwheel/__main__.py

@@ -160,9 +160,9 @@ def build_in_directory(args: CommandLineArguments) -> None:
                 textwrap.dedent(
                     """
                     cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server;
-                    Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, and Gitlab are
-                    supported. You can run on your development machine or other CI providers using the
-                    --platform argument. Check --help output for more information.
+                    Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, Gitlab, and Cirrus CI
+                    are supported. You can run on your development machine or other CI providers
+                    using the --platform argument. Check --help output for more information.
                     """
                 ),
                 file=sys.stderr,

cibuildwheel/linux.py

@@ -349,6 +349,7 @@ def build(options: Options, tmp_path: Path) -> None:  # pylint: disable=unused-a
                 If you're building on Travis CI, add `services: [docker]` to
                 your .travis.yml. If you're building on Circle CI in Linux,
                 add a `setup_remote_docker` step to your .circleci/config.yml.
+                If you're building on Cirrus CI, use `docker_builder` task.
                 """
             ),
             file=sys.stderr,

cibuildwheel/util.py

@@ -393,6 +393,7 @@ class CIProvider(Enum):
     azure_pipelines = "azure_pipelines"
     github_actions = "github_actions"
     gitlab = "gitlab"
+    cirrus_ci = "cirrus_ci"
     other = "other"
 
 
@@ -409,6 +410,8 @@ def detect_ci_provider() -> CIProvider | None:
         return CIProvider.github_actions
     elif "GITLAB_CI" in os.environ:
         return CIProvider.gitlab
+    elif "CIRRUS_CI" in os.environ:
+        return CIProvider.cirrus_ci
     elif strtobool(os.environ.get("CI", "false")):
         return CIProvider.other
     else: