Update default schema, add test plan and reconfigure CI

evgeniyd · Feb 26, 2024 · db13648 · db13648
1 parent d5d5137
commit db13648
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -22,4 +22,4 @@ jobs:
     - name: Xcode version
       run: /usr/bin/xcodebuild -version
     - name: Build and Test
-      run: xcodebuild clean build test -project UnionStreet.xcodeproj -scheme "UnionStreet" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk macosx -destination "platform=macOS" ONLY_ACTIVE_ARCH=YES
+      run: xcodebuild clean build test -project UnionStreet.xcodeproj -scheme "Default" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk macosx -destination "platform=macOS" ONLY_ACTIVE_ARCH=YES
diff --git a/UnionStreet.xcodeproj/project.pbxproj b/UnionStreet.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
 		5843305E2B8D21900072AFEC /* UnionStreetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnionStreetTests.swift; sourceTree = "<group>"; };
 		5843306B2B8D22040072AFEC /* UnionFind.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnionFind.swift; sourceTree = "<group>"; };
 		5843306D2B8D23CD0072AFEC /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		5843306E2B8D38B80072AFEC /* UnionStreet.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnionStreet.xctestplan; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -85,6 +86,7 @@
 		5843305D2B8D21900072AFEC /* UnionStreetTests */ = {
 			isa = PBXGroup;
 			children = (
+				5843306E2B8D38B80072AFEC /* UnionStreet.xctestplan */,
 				5843305E2B8D21900072AFEC /* UnionStreetTests.swift */,
 			);
 			path = UnionStreetTests;

diff --git a/...shareddata/xcschemes/UnionStreet.xcscheme → ...j/xcshareddata/xcschemes/Default.xcscheme b/...shareddata/xcschemes/UnionStreet.xcscheme → ...j/xcshareddata/xcschemes/Default.xcscheme
@@ -26,21 +26,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "584330582B8D21900072AFEC"
-               BuildableName = "UnionStreetTests.xctest"
-               BlueprintName = "UnionStreetTests"
-               ReferencedContainer = "container:UnionStreet.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:UnionStreetTests/UnionStreet.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

diff --git a/UnionStreetTests/UnionStreet.xctestplan b/UnionStreetTests/UnionStreet.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "4A03A2CC-5A18-4ABE-A85D-BC0FEEA36C45",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "testExecutionOrdering" : "random"
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:UnionStreet.xcodeproj",
+        "identifier" : "584330582B8D21900072AFEC",
+        "name" : "UnionStreetTests"
+      }
+    }
+  ],
+  "version" : 1
+}