Revert "workflow consolidation"

This reverts commit 0150020.

Author: ncooke3

.github/workflows/database.yml

@@ -30,44 +30,52 @@ env:
   secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }}
 
 jobs:
+  spm-buildonly:
+    name: spm (non-SwiftUI)
+    runs-on: macOS-15
+    env:
+      OS: iOS
+      SPM: true
+      LEGACY: false
+      DIR: database
+      DEVICE: iPhone 16
+      TEST: false
+      SCHEME: DatabaseExampleSwift
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Setup
+        run: |
+          gem install xcpretty
+          cd database
+          ../scripts/install_prereqs/database.sh
+      - name: Build Swift
+        run: ./scripts/test.sh
+
   spm:
-    name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.name }})
+    name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
     runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["16.4"]
+        os: [iOS, tvOS, macOS]
         include:
-          - name: "non-SwiftUI"
-            os: iOS
-            device: "iPhone 16"
-            test: false
-            dir: "database"
-            scheme: "DatabaseExampleSwift"
-            legacy: false
-          - name: "iOS"
-            os: iOS
-            device: "iPhone 16"
+          - os: iOS
+            device: iPhone 16
             test: false
-            dir: "database/DatabaseExampleSwiftUI/DatabaseExample"
-          - name: "tvOS"
-            os: tvOS
-            device: "Apple TV 4K (3rd generation) (at 1080p)"
+          - os: tvOS
+            device: Apple TV 4K (3rd generation) (at 1080p)
             test: true
-            dir: "database/DatabaseExampleSwiftUI/DatabaseExample"
-          - name: "macOS"
-            os: macOS
-            device: "localhost"
+          - os: macOS
+            device: localhost
             test: false # flaky macOS UITest: UITests.testStaticSignUpView() sometimes fails
-            dir: "database/DatabaseExampleSwiftUI/DatabaseExample"
     env:
       SETUP: database
       SPM: true
-      DIR: ${{ matrix.dir }}
+      DIR: database/DatabaseExampleSwiftUI/DatabaseExample
       OS: ${{ matrix.os }}
       DEVICE: ${{ matrix.device }}
       TEST: ${{ matrix.test }}
-      SCHEME: ${{ matrix.scheme }}
-      LEGACY: ${{ matrix.legacy }}
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -76,5 +84,5 @@ jobs:
           gem install xcpretty
           cd $SETUP
           ../scripts/install_prereqs/${SETUP}.sh
-      - name: Build and Test
+      - name: Build and Test SwiftUI (${{ matrix.os }})
         run: ./scripts/test.sh

.github/workflows/performance.yml

@@ -34,39 +34,49 @@ env:
   secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }}
 
 jobs:
+  spm-buildonly:
+    name: spm
+    runs-on: macOS-15
+    env:
+      SPM: true
+      LEGACY: false
+      OS: iOS
+      DEVICE: iPhone 16
+      TEST: true
+      DIR: performance
+      SCHEME: PerformanceExampleSwift
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Setup
+        run: |
+          cd performance
+          gem install xcpretty
+          ../scripts/install_prereqs/performance.sh
+      - name: Build Swift
+        run: ./scripts/test.sh
+          
   spm:
-    name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.name }})
+    name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
     runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["16.4"]
+        os: [iOS, tvOS]
         include:
-          - name: "non-SwiftUI"
-            os: iOS
-            device: "iPhone 16"
-            test: true
-            dir: "performance"
-            scheme: "PerformanceExampleSwift"
-            legacy: false
-          - name: "iOS"
-            os: iOS
-            device: "iPhone 16"
+          - os: iOS
+            device: iPhone 16
             test: false
-            dir: "performance/SwiftUIPerformanceQuickstart/PerformanceExample"
-          - name: "tvOS"
-            os: tvOS
-            device: "Apple TV 4K (3rd generation) (at 1080p)"
+          - os: tvOS
+            device: Apple TV 4K (3rd generation) (at 1080p)
             test: false
-            dir: "performance/SwiftUIPerformanceQuickstart/PerformanceExample"
     env:
       SETUP: performance
       SPM: true
-      DIR: ${{ matrix.dir }}
+      DIR: performance/SwiftUIPerformanceQuickstart/PerformanceExample
       OS: ${{ matrix.os }}
       DEVICE: ${{ matrix.device }}
       TEST: ${{ matrix.test }}
-      SCHEME: ${{ matrix.scheme }}
-      LEGACY: ${{ matrix.legacy }}
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -75,5 +85,5 @@ jobs:
           gem install xcpretty
           cd $SETUP
           ../scripts/install_prereqs/${SETUP}.sh
-      - name: Build and Test
+      - name: Build and Test SwiftUI (${{ matrix.os }})
         run: ./scripts/test.sh