Add acceptance test and add ability to run multiplatform targets via …

…`test` and `build`
tuist · Nov 21, 2023 · 378a581 · 378a581
1 parent 92d956b
commit 378a581
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 6 deletions.
diff --git a/Sources/TuistKit/Commands/BuildCommand.swift b/Sources/TuistKit/Commands/BuildCommand.swift
@@ -40,6 +40,12 @@ struct BuildCommand: AsyncParsableCommand {
     )
     var device: String?
 
+    @Option(
+        name: .long,
+        help: "Build for a specific platform."
+    )
+    var platform: String?
+
     @Option(
         name: .shortAndLong,
         help: "Build with a specific version of the OS."
@@ -86,6 +92,7 @@ struct BuildCommand: AsyncParsableCommand {
             derivedDataPath: derivedDataPath,
             path: absolutePath,
             device: device,
+            platform: platform,
             osVersion: os,
             rosetta: rosetta
         )

diff --git a/Sources/TuistKit/Commands/TestCommand.swift b/Sources/TuistKit/Commands/TestCommand.swift
@@ -40,6 +40,12 @@ public struct TestCommand: AsyncParsableCommand, HasTrackableParameters {
         help: "Test on a specific device."
     )
     var device: String?
+
+    @Option(
+        name: .shortAndLong,
+        help: "Test on a specific platform."
+    )
+    var platform: String?
 
     @Option(
         name: .shortAndLong,
@@ -140,6 +146,7 @@ public struct TestCommand: AsyncParsableCommand, HasTrackableParameters {
             configuration: configuration,
             path: absolutePath,
             deviceName: device,
+            platform: platform,
             osVersion: os,
             rosetta: rosetta,
             skipUITests: skipUITests,

diff --git a/Sources/TuistKit/Services/BuildService.swift b/Sources/TuistKit/Services/BuildService.swift
@@ -58,6 +58,7 @@ final class BuildService {
         derivedDataPath: String?,
         path: AbsolutePath,
         device: String?,
+        platform: String?,
         osVersion: String?,
         rosetta: Bool
     ) async throws {
@@ -96,10 +97,18 @@ final class BuildService {
             guard let graphTarget = buildGraphInspector.buildableTarget(scheme: scheme, graphTraverser: graphTraverser) else {
                 throw TargetBuilderError.schemeWithoutBuildableTargets(scheme: scheme.name)
             }
-
+
+            let buildPlatform: TuistGraph.Platform
+
+            if let platform, let inputPlatform = TuistGraph.Platform(rawValue: platform) {
+                buildPlatform = inputPlatform
+            } else {
+                buildPlatform = try graphTarget.target.servicePlatform
+            }
+
             try await targetBuilder.buildTarget(
                 graphTarget,
-                platform: try graphTarget.target.servicePlatform,
+                platform: buildPlatform,
                 workspacePath: workspacePath,
                 scheme: scheme,
                 clean: clean,
@@ -119,10 +128,18 @@ final class BuildService {
                 guard let graphTarget = buildGraphInspector.buildableTarget(scheme: scheme, graphTraverser: graphTraverser) else {
                     throw TargetBuilderError.schemeWithoutBuildableTargets(scheme: scheme.name)
                 }
+
+                let buildPlatform: TuistGraph.Platform
+
+                if let platform, let inputPlatform = TuistGraph.Platform(rawValue: platform) {
+                    buildPlatform = inputPlatform
+                } else {
+                    buildPlatform = try graphTarget.target.servicePlatform
+                }
 
                 try await targetBuilder.buildTarget(
                     graphTarget,
-                    platform: try graphTarget.target.servicePlatform,
+                    platform: buildPlatform,
                     workspacePath: workspacePath,
                     scheme: scheme,
                     clean: !cleaned && clean,

diff --git a/Sources/TuistKit/Services/TestService.swift b/Sources/TuistKit/Services/TestService.swift
@@ -156,6 +156,7 @@ public final class TestService { // swiftlint:disable:this type_body_length
         configuration: String?,
         path: AbsolutePath,
         deviceName: String?,
+        platform: String?,
         osVersion: String?,
         rosetta: Bool,
         skipUITests: Bool,
@@ -245,6 +246,7 @@ public final class TestService { // swiftlint:disable:this type_body_length
                     configuration: configuration,
                     version: version,
                     deviceName: deviceName,
+                    platform: platform,
                     rosetta: rosetta,
                     resultBundlePath: resultBundlePath,
                     derivedDataPath: derivedDataPath,
@@ -273,6 +275,7 @@ public final class TestService { // swiftlint:disable:this type_body_length
                     configuration: configuration,
                     version: version,
                     deviceName: deviceName,
+                    platform: platform,
                     rosetta: rosetta,
                     resultBundlePath: resultBundlePath,
                     derivedDataPath: derivedDataPath,
@@ -315,6 +318,7 @@ public final class TestService { // swiftlint:disable:this type_body_length
         configuration: String?,
         version: Version?,
         deviceName: String?,
+        platform: String?,
         rosetta: Bool,
         resultBundlePath: AbsolutePath?,
         derivedDataPath: AbsolutePath?,
@@ -343,11 +347,18 @@ public final class TestService { // swiftlint:disable:this type_body_length
             throw TestServiceError.schemeWithoutTestableTargets(scheme: scheme.name, testPlan: testPlanConfiguration?.testPlan)
         }
 
-        let platform = try buildableTarget.target.servicePlatform
+        let buildPlatform: TuistGraph.Platform
+
+        if let platform, let inputPlatform = TuistGraph.Platform(rawValue: platform) {
+            buildPlatform = inputPlatform
+        } else {
+            buildPlatform = try buildableTarget.target.servicePlatform
+        }
+
 
         let destination = try await XcodeBuildDestination.find(
             for: buildableTarget.target,
-            on: platform,
+            on: buildPlatform,
             scheme: scheme,
             version: version,
             deviceName: deviceName,

diff --git a/Tests/TuistBuildAcceptanceTests/BuildAcceptanceTests.swift b/Tests/TuistBuildAcceptanceTests/BuildAcceptanceTests.swift
@@ -95,3 +95,12 @@ final class BuildAcceptanceTestFrameworkWithSwiftMacroIntegratedWithXcodeProjPri
         try await run(BuildCommand.self, "Framework")
     }
 }
+
+final class BuildAcceptanceTestMultiplatformAppWithSDK: TuistAcceptanceTestCase {
+    func test() async throws {
+        try setUpFixture("multiplatform_app_with_sdk")
+        try await run(FetchCommand.self)
+        try await run(BuildCommand.self, "App", "--platform", "macos")
+        try await run(BuildCommand.self, "App", "--platform", "ios")
+    }
+}
diff --git a/Tests/TuistKitTests/Services/BuildServiceTests.swift b/Tests/TuistKitTests/Services/BuildServiceTests.swift
@@ -308,6 +308,7 @@ extension BuildService {
         derivedDataPath: String? = nil,
         path: AbsolutePath,
         device: String? = nil,
+        platform: String? = nil,
         osVersion: String? = nil,
         rosetta: Bool = false
     ) async throws {
@@ -319,7 +320,8 @@ extension BuildService {
             buildOutputPath: buildOutputPath,
             derivedDataPath: derivedDataPath,
             path: path,
-            device: device,
+            device: device, 
+            platform: platform,
             osVersion: osVersion,
             rosetta: rosetta
         )

diff --git a/Tests/TuistKitTests/Services/TestServiceTests.swift b/Tests/TuistKitTests/Services/TestServiceTests.swift
@@ -629,6 +629,7 @@ extension TestService {
         configuration: String? = nil,
         path: AbsolutePath,
         deviceName: String? = nil,
+        platform: String? = nil,
         osVersion: String? = nil,
         rosetta: Bool = false,
         skipUiTests: Bool = false,
@@ -645,6 +646,7 @@ extension TestService {
             configuration: configuration,
             path: path,
             deviceName: deviceName,
+            platform: platform,
             osVersion: osVersion,
             rosetta: rosetta,
             skipUITests: skipUiTests,