codemagic-cli-tools 0.41.0__tar.gz → 0.42.0__tar.gz

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codemagic-cli-tools
-Version: 0.41.0
+Version: 0.42.0
 Summary: CLI tools used in Codemagic builds
 Home-page: https://github.com/codemagic-ci-cd/cli-tools
 License: GPL-3.0-or-later

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codemagic-cli-tools"
-version = "0.41.0"
+version = "0.42.0"
 description = "CLI tools used in Codemagic builds"
 readme = "README.md"
 authors = [

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/src/codemagic/__version__.py

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = '0.41.0'
+__version__ = '0.42.0'
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/src/codemagic/__version__.py-e

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = "0.41.0.dev"
+__version__ = "0.42.0.dev"
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/src/codemagic/models/xcodebuild.py

@@ -176,7 +176,7 @@ class Xcodebuild(RunningCliAppMixin):
 
     def _construct_test_command(
         self,
-        sdk: str,
+        sdk: Optional[str],
         simulators: List[Simulator],
         only_testing: Optional[str],
         enable_code_coverage: bool,
@@ -188,6 +188,7 @@ class Xcodebuild(RunningCliAppMixin):
         max_devices_flag = "-maximum-concurrent-test-device-destinations"
         max_sims_flag = "-maximum-concurrent-test-simulator-destinations"
 
+        sdk_args = ["-sdk", sdk] if sdk else []
         destinations_args = [["-destination", f"id={s.udid}"] for s in simulators]
         only_testing_args = ["-only-testing", only_testing] if only_testing else []
         max_devices_args = [max_devices_flag, str(max_devices)] if max_devices else []
@@ -197,8 +198,7 @@ class Xcodebuild(RunningCliAppMixin):
         return [
             *self._construct_base_command(custom_flags),
             *only_testing_args,
-            "-sdk",
-            sdk,
+            *sdk_args,
             *coverage_args,
             *reduce(add, destinations_args, []),
             *max_devices_args,
@@ -280,7 +280,7 @@ class Xcodebuild(RunningCliAppMixin):
 
     def test(
         self,
-        sdk: str,
+        sdk: Optional[str],
         simulators: List[Simulator],
         *,
         enable_code_coverage: bool = False,

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/src/codemagic/tools/_xcode_project/arguments.py

@@ -319,6 +319,13 @@ class TestArgument(cli.Argument):
         description="Name of the SDK that should be used for building the application for testing.",
         argparse_kwargs={"required": False, "default": "iphonesimulator"},
     )
+    OMIT_TEST_SDK = cli.ArgumentProperties(
+        key="omit_test_sdk",
+        flags=("--omit-sdk",),
+        type=bool,
+        description="Do not pass -sdk argument to `xcodebuild test` command",
+        argparse_kwargs={"required": False, "action": "store_true"},
+    )
 
 
 class TestResultArgument(cli.Argument):

{codemagic_cli_tools-0.41.0 → codemagic_cli_tools-0.42.0}/src/codemagic/tools/xcode_project.py

@@ -431,6 +431,7 @@ class XcodeProject(cli.CliApp, PathFinderMixin):
         TestArgument.TEST_DEVICES,
         TestArgument.TEST_ONLY,
         TestArgument.TEST_SDK,
+        TestArgument.OMIT_TEST_SDK,
         TestResultArgument.OUTPUT_DIRECTORY,
         TestResultArgument.OUTPUT_EXTENSION,
         XcodeArgument.TEST_FLAGS,
@@ -459,6 +460,7 @@ class XcodeProject(cli.CliApp, PathFinderMixin):
         output_dir: pathlib.Path = TestResultArgument.OUTPUT_DIRECTORY.get_default(),
         output_extension: str = TestResultArgument.OUTPUT_EXTENSION.get_default(),
         graceful_exit: bool = False,
+        omit_test_sdk: bool = False,
     ):
         """
         Run unit or UI tests for given Xcode project or workspace
@@ -473,7 +475,7 @@ class XcodeProject(cli.CliApp, PathFinderMixin):
         xcresult_collector.ignore_results(Xcode.DERIVED_DATA_PATH)
         try:
             xcodebuild.test(
-                test_sdk,
+                None if omit_test_sdk else test_sdk,
                 simulators,
                 enable_code_coverage=not disable_code_coverage,
                 only_testing=test_only,
@@ -669,14 +671,18 @@ class XcodeProject(cli.CliApp, PathFinderMixin):
                 f'File "{export_options_plist}" is not a valid property list',
             )
 
-    def _get_test_destinations(self, test_sdk: str, requested_devices: Optional[List[str]]) -> List[Simulator]:
+    def _get_test_destinations(
+        self,
+        test_sdk: str | None,
+        requested_devices: Optional[List[str]],
+    ) -> List[Simulator]:
         if requested_devices:
             try:
                 simulators = Simulator.find_simulators(requested_devices)
             except ValueError as ve:
                 raise TestArgument.TEST_DEVICES.raise_argument_error(str(ve)) from ve
-        elif "macos" in test_sdk.lower():
-            # macOS tests are run on the host machine and no test destinations are required
+        elif test_sdk and "macos" in test_sdk.lower():
+            # macOS tests run on the host machine and no test destinations are required
             simulators = []
         else:
             simulators = [self.get_default_test_destination(should_print=False)]