From b0bb64c4bfa816850c5654cb8ad95c88fef63f7f Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 10 Oct 2019 20:02:50 -0500
Subject: [PATCH] Prepare to add the iOS build

---
 .github/workflows/build.yml                        |  5 +++++
 .../certs/{dev.cer.enc => mac-dist.cer.enc}        |  0
 .../certs/{dev.p12.enc => mac-dist.p12.enc}        |  0
 buildscripts/ci-build.sh                           | 14 +++++++-------
 submodules/RSCore                                  |  2 +-
 submodules/RSDatabase                              |  2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)
 rename buildscripts/certs/{dev.cer.enc => mac-dist.cer.enc} (100%)
 rename buildscripts/certs/{dev.p12.enc => mac-dist.p12.enc} (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12f4398e5..6b6b2bfeb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,10 @@ jobs:
   build:
 
     runs-on: macOS-latest
+    strategy: 
+      matrix:
+        scheme: ['NetNewsWire']
+#        scheme: ['NetNewsWire', 'NetNewsWire-iOS']
     
     steps:
     - name: Checkout Project
@@ -23,4 +27,5 @@ jobs:
       env:
           ENCRYPTION_SECRET: ${{ secrets.ENCRYPTION_SECRET }}
           KEY_SECRET: ${{ secrets.KEY_SECRET }}
+          SCHEME: ${{ secrets.scheme }}
       run: buildscripts/ci-build.sh
diff --git a/buildscripts/certs/dev.cer.enc b/buildscripts/certs/mac-dist.cer.enc
similarity index 100%
rename from buildscripts/certs/dev.cer.enc
rename to buildscripts/certs/mac-dist.cer.enc
diff --git a/buildscripts/certs/dev.p12.enc b/buildscripts/certs/mac-dist.p12.enc
similarity index 100%
rename from buildscripts/certs/dev.p12.enc
rename to buildscripts/certs/mac-dist.p12.enc
diff --git a/buildscripts/ci-build.sh b/buildscripts/ci-build.sh
index c33c17834..4deccbd27 100755
--- a/buildscripts/ci-build.sh
+++ b/buildscripts/ci-build.sh
@@ -4,14 +4,14 @@ set -e
 
 # Unencrypt our provisioning profile, certificate, and private key
 openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/profile/NetNewsWire.provisionprofile.enc -d -a -out buildscripts/profile/NetNewsWire.provisionprofile
-openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/certs/dev.cer.enc -d -a -out buildscripts/certs/dev.cer
-openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/certs/dev.p12.enc -d -a -out buildscripts/certs/dev.p12
+openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/certs/mac-dist.cer.enc -d -a -out buildscripts/certs/mac-dist.cer
+openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in buildscripts/certs/mac-dist.p12.enc -d -a -out buildscripts/certs/mac-dist.p12
 
 # Put the certificates and private key in the Keychain, set ACL permissions, and make default
 security create-keychain -p github-actions github-build.keychain
 security import buildscripts/certs/apple.cer -k ~/Library/Keychains/github-build.keychain -A
-security import buildscripts/certs/dev.cer -k ~/Library/Keychains/github-build.keychain -A
-security import buildscripts/certs/dev.p12 -k ~/Library/Keychains/github-build.keychain -P $KEY_SECRET -A
+security import buildscripts/certs/mac-dist.cer -k ~/Library/Keychains/github-build.keychain -A
+security import buildscripts/certs/mac-dist.p12 -k ~/Library/Keychains/github-build.keychain -P $KEY_SECRET -A
 security set-key-partition-list -S apple-tool:,apple: -s -k github-actions github-build.keychain
 security default-keychain -s github-build.keychain
 
@@ -21,11 +21,11 @@ cp buildscripts/profile/NetNewsWire.provisionprofile ~/Library/MobileDevice/Prov
 
 # Delete the decrypted files
 rm -f buildscripts/profile/NetNewsWire.provisionprofile
-rm -f buildscripts/certs/dev.cer
-rm -f buildscripts/certs/dev.p12
+rm -f buildscripts/certs/mac-dist.cer
+rm -f buildscripts/certs/mac-dist.p12
 
 # Do the build
-xcodebuild -scheme 'NetNewsWire' -configuration Release -showBuildTimingSummary
+xcodebuild -scheme $SCHEME -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 1f4f6eaf1..b365f09e3 160000
--- a/submodules/RSCore
+++ b/submodules/RSCore
@@ -1 +1 @@
-Subproject commit 1f4f6eaf183734c7ffd87cee49f205527b64faf2
+Subproject commit b365f09e3b08e7645f2fc348689df6bfe068b6ae
diff --git a/submodules/RSDatabase b/submodules/RSDatabase
index 83ea9ea7c..67ca63168 160000
--- a/submodules/RSDatabase
+++ b/submodules/RSDatabase
@@ -1 +1 @@
-Subproject commit 83ea9ea7c49314c155bd55ea43c44ab2ed82e398
+Subproject commit 67ca6316827061759ce63dcf60903794a8375153