From 3c75394992d0c63243b2cddd4df56c18bb2325c2 Mon Sep 17 00:00:00 2001
From: Paul Schmiedmayer <PSchmiedmayer@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:38:02 -0700
Subject: [PATCH] Update CI

---
 .github/workflows/build-and-test.yml | 28 +++++++---------------------
 fastlane/Fastfile                    |  4 ++--
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 09475d2..c1b8f3f 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,20 +20,14 @@ jobs:
   swiftlint:
     name: SwiftLint
     uses: StanfordBDHG/.github/.github/workflows/swiftlint.yml@v2
-  ios:
-    name: Build and Test iOS
+  buildandtest:
+    name: Build and Test
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
-      scheme: TemplateApplication
+      runsonlabels: '["macOS", "self-hosted"]'
+      xcodeversion: latest
+      fastlanelane: test
       artifactname: TemplateApplication.xcresult
-  ipados:
-    name: Build and Test iPadOS
-    uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
-    with:
-      scheme: TemplateApplication
-      resultBundle: TemplateApplicationiPadOS.xcresult
-      destination: 'platform=iOS Simulator,name=iPad mini (6th generation)'
-      artifactname: TemplateApplicationiPadOS.xcresult
   visionos:
     name: Build and Test visionOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
@@ -43,17 +37,9 @@ jobs:
       scheme: TemplateApplication
       destination: 'platform=visionOS Simulator,name=Apple Vision Pro'
       test: false
-  watchos:
-    name: Build and Test watchOS
-    uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
-    with:
-      scheme: TemplateApplicationWatchApp
-      resultBundle: TemplateApplicationWatchApp.xcresult
-      destination: 'platform=watchOS Simulator,name=Apple Watch Series 8 (45mm)'
-      artifactname: TemplateApplicationWatchApp.xcresult
   uploadcoveragereport:
     name: Upload Coverage Report
-    needs: [ios, ipados, watchos]
+    needs: [buildandtest]
     uses: StanfordBDHG/.github/.github/workflows/create-and-upload-coverage-report.yml@v2
     with:
-      coveragereports: TemplateApplication.xcresult TemplateApplicationiPadOS.xcresult TemplateApplicationWatchApp.xcresult
+      coveragereports: TemplateApplication.xcresult
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index d7843f7..abeccc4 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -20,7 +20,7 @@ platform :ios do
       skip_build: true,
       derived_data_path: ".derivedData",
       code_coverage: true,
-      devices: ["iPhone 14 Pro", "iPad mini (6th generation)"],
+      devices: ["iPhone 14 Pro", "iPad mini (6th generation), Apple Watch Series 8 (45mm)"],
       force_quit_simulator: true,
       reset_simulator: true,
       prelaunch_simulator: true,
@@ -38,7 +38,7 @@ platform :ios do
       export_options: {
         provisioningProfiles: { 
           "edu.stanford.templateapplication" => "TemplateApplication",
-          "edu.stanford.templateapplication.watchkitapp" => "TemplateApplicationWatchApp"
+          "edu.stanford.templateapplication.watchkitapp" => "TemplateWatchApplication"
         }
       }
     )