From 8eabcd34bb05caa55ae0eee6d4fcdf735c06ae5e Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Fri, 11 Oct 2019 12:10:15 -0500
Subject: [PATCH] Build to run tests in NNW and all NNW frameworks

---
 .github/workflows/build.yml                   | 11 ++++++-
 .../xcschemes/NetNewsWire.xcscheme            | 30 +++++++++++++++++++
 buildscripts/ci-build.sh                      |  2 +-
 submodules/RSCore                             |  2 +-
 submodules/RSDatabase                         |  2 +-
 submodules/RSParser                           |  2 +-
 submodules/RSTree                             |  2 +-
 submodules/RSWeb                              |  2 +-
 8 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index be94a8480..d2311060d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,17 @@ jobs:
     - name: Switch to Xcode 11
       run: sudo xcode-select -s /Applications/Xcode_11.app
 
-    - name: xcodebuild -showBuildSettings
+    - name: Build Version
+      run: xcodebuild -version
+
+    - name: Build Settings
       run: xcodebuild -showBuildSettings
+      
+    - name: Build SDK
+      run: xcodebuild -showsdks
+    
+    - name: Show Available Destinations
+      run: xcodebuild -scheme RSDatabaseiOS -showdestinations
     
     - name: Run Build
       env:
diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
index a9a1ce816..9f0bda0dc 100644
--- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
+++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
@@ -38,6 +38,36 @@
                ReferencedContainer = "container:NetNewsWire.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "848934FE1F62484F00CEBD24"
+               BuildableName = "AccountTests.xctest"
+               BlueprintName = "AccountTests"
+               ReferencedContainer = "container:Frameworks/Account/Account.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "844BEE631F0AB3C9004AB7CD"
+               BuildableName = "ArticlesTests.xctest"
+               BlueprintName = "ArticlesTests"
+               ReferencedContainer = "container:Frameworks/Articles/Articles.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "844BEE3F1F0AB3AB004AB7CD"
+               BuildableName = "ArticlesDatabaseTests.xctest"
+               BlueprintName = "ArticlesDatabaseTests"
+               ReferencedContainer = "container:Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/buildscripts/ci-build.sh b/buildscripts/ci-build.sh
index 4deccbd27..cdcb37040 100755
--- a/buildscripts/ci-build.sh
+++ b/buildscripts/ci-build.sh
@@ -25,7 +25,7 @@ rm -f buildscripts/certs/mac-dist.cer
 rm -f buildscripts/certs/mac-dist.p12
 
 # Do the build
-xcodebuild -scheme $SCHEME -configuration Release -showBuildTimingSummary
+xcodebuild -scheme $SCHEME test -configuration Release -showBuildTimingSummary
 
 # Delete the keychain and the provisioningi profile
 security delete-keychain github-build.keychain
diff --git a/submodules/RSCore b/submodules/RSCore
index b365f09e3..6b2cf7184 160000
--- a/submodules/RSCore
+++ b/submodules/RSCore
@@ -1 +1 @@
-Subproject commit b365f09e3b08e7645f2fc348689df6bfe068b6ae
+Subproject commit 6b2cf71844506bd5b2d99fa3c1a6052df8724d71
diff --git a/submodules/RSDatabase b/submodules/RSDatabase
index 67ca63168..262f6795e 160000
--- a/submodules/RSDatabase
+++ b/submodules/RSDatabase
@@ -1 +1 @@
-Subproject commit 67ca6316827061759ce63dcf60903794a8375153
+Subproject commit 262f6795e4c46da9c15e7249f7400104371bc343
diff --git a/submodules/RSParser b/submodules/RSParser
index 77c52fdcb..ca99c09bd 160000
--- a/submodules/RSParser
+++ b/submodules/RSParser
@@ -1 +1 @@
-Subproject commit 77c52fdcb1940f9fc5ef869845bfc0722a401784
+Subproject commit ca99c09bd0b8d75976648ea2bdc8756e6b1e59af
diff --git a/submodules/RSTree b/submodules/RSTree
index 3206a2073..c03b66f7b 160000
--- a/submodules/RSTree
+++ b/submodules/RSTree
@@ -1 +1 @@
-Subproject commit 3206a2073576bd808cbf0b13e20a9372d977d7f9
+Subproject commit c03b66f7bbb4602c7f8f0053e3c9a6a49b72f7b0
diff --git a/submodules/RSWeb b/submodules/RSWeb
index e984f1996..95f78ad5f 160000
--- a/submodules/RSWeb
+++ b/submodules/RSWeb
@@ -1 +1 @@
-Subproject commit e984f1996cb418bb88c54889bae8a3f2adf39f73
+Subproject commit 95f78ad5f95423150d1f7fb557d70bd247dfb0dc