Prepare to add the iOS build

.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

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

submodules/RSCore

@@ -1 +1 @@
-Subproject commit 1f4f6eaf183734c7ffd87cee49f205527b64faf2
+Subproject commit b365f09e3b08e7645f2fc348689df6bfe068b6ae

submodules/RSDatabase

@@ -1 +1 @@
-Subproject commit 83ea9ea7c49314c155bd55ea43c44ab2ed82e398
+Subproject commit 67ca6316827061759ce63dcf60903794a8375153