From d0ffada44a39b35a09e42af5ec97fa3be8f77391 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 2 Apr 2025 11:26:45 +1100
Subject: [PATCH 1/4] Add CI step to run the WordPressData tests

---
 .buildkite/pipeline.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 765e6f19b3ae..6c8ae14f2b60 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -71,6 +71,20 @@ steps:
         notify:
           - github_commit_status:
               context: "Reader Unit Tests"
+      - label: "🔬 WordPressData Unit Tests"
+        command: |
+          .buildkite/commands/shared-set-up.sh
+          xcodebuild \
+            -scheme WordPressData \
+            -destination 'platform=iOS Simulator,OS=18.3.1,name=iPhone 16' \
+            test \
+            | xcbeautify
+        plugins: [$CI_TOOLKIT_PLUGIN]
+        artifact_paths:
+          - "build/results/*"
+        notify:
+          - github_commit_status:
+              context: "Unit Tests WordPressData"
 
   #################
   # UI Tests

From 2b85d901821e1ca44c14d983ea2b5f4c5aa2efc5 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 2 Apr 2025 11:26:19 +1100
Subject: [PATCH 2/4] Track shared scheme for Keystone framework

---
 .../xcshareddata/xcschemes/Keystone.xcscheme  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Keystone.xcscheme

diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Keystone.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Keystone.xcscheme
new file mode 100644
index 000000000000..c2ae777d497f
--- /dev/null
+++ b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Keystone.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0CED016F2D95B897003015CF"
+               BuildableName = "Keystone.framework"
+               BlueprintName = "Keystone"
+               ReferencedContainer = "container:WordPress.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0CED016F2D95B897003015CF"
+            BuildableName = "Keystone.framework"
+            BlueprintName = "Keystone"
+            ReferencedContainer = "container:WordPress.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

From 57df3e54b4a60023b49a43b805b6946a379e4274 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 2 Apr 2025 11:29:26 +1100
Subject: [PATCH 3/4] Add CI step to unit test Keystone

That's even though there is not yet a test target for Keystone.
---
 .buildkite/pipeline.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6c8ae14f2b60..f9065763362e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -71,6 +71,20 @@ steps:
         notify:
           - github_commit_status:
               context: "Reader Unit Tests"
+      - label: "🔬 Keystone Unit Tests"
+        command: |
+          .buildkite/commands/shared-set-up.sh
+          xcodebuild \
+            -scheme Keystone \
+            -destination 'platform=iOS Simulator,OS=18.3.1,name=iPhone 16' \
+            test \
+            | xcbeautify
+        plugins: [$CI_TOOLKIT_PLUGIN]
+        artifact_paths:
+          - "build/results/*"
+        notify:
+          - github_commit_status:
+              context: "Unit Tests Keystone"
       - label: "🔬 WordPressData Unit Tests"
         command: |
           .buildkite/commands/shared-set-up.sh

From 0ae6031b0646f3f880459aead254252b8fbf7e09 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 2 Apr 2025 11:47:30 +1100
Subject: [PATCH 4/4] Use iOS 18.2 Simulator for Keystone and WordPressData

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f9065763362e..99dd414439f7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -76,7 +76,7 @@ steps:
           .buildkite/commands/shared-set-up.sh
           xcodebuild \
             -scheme Keystone \
-            -destination 'platform=iOS Simulator,OS=18.3.1,name=iPhone 16' \
+            -destination 'platform=iOS Simulator,OS=18.2,name=iPhone 16' \
             test \
             | xcbeautify
         plugins: [$CI_TOOLKIT_PLUGIN]
@@ -90,7 +90,7 @@ steps:
           .buildkite/commands/shared-set-up.sh
           xcodebuild \
             -scheme WordPressData \
-            -destination 'platform=iOS Simulator,OS=18.3.1,name=iPhone 16' \
+            -destination 'platform=iOS Simulator,OS=18.2,name=iPhone 16' \
             test \
             | xcbeautify
         plugins: [$CI_TOOLKIT_PLUGIN]