From 3ff85134a8ac14caf3147ee9ab8fbf8a7ab65368 Mon Sep 17 00:00:00 2001
From: Marcos Griselli <marcosg@lyft.com>
Date: Tue, 11 Jun 2024 17:59:04 -0700
Subject: [PATCH] Update test actions

---
 .github/workflows/Test.yml | 20 ++++++--------------
 Makefile                   | 22 +++++++++++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 2bb3fde..ddf346f 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -15,8 +15,6 @@ jobs:
         run: ls /Applications | grep Xcode
       - name: Force Xcode 15.4
         run: sudo xcode-select -switch /Applications/Xcode_15.4.app
-      - name: List available simulators
-        run: xcrun simctl list
       - name: Make project
         run: make generate
       - name: Run tests
@@ -37,24 +35,18 @@ jobs:
         run: make generate
       - name: Run tests
         run: make test-iPhone
-  test_iphone_ios12:
-    name: Test-iPhone-iOS12
-    runs-on: macos-10.15
+  test_iphone_ios13:
+    name: Test-iPhone-iOS15
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: List available Xcode versions
         run: ls /Applications | grep Xcode
-      - name: Force Xcode 15.4
-        run: sudo xcode-select -switch /Applications/Xcode_15.4.app
-      - name: Setup Simulator
-        run: |
-          sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes
-          sudo ln -s /Applications/Xcode_15.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 12.4.simruntime
-      - name: List available simulators
-        run: xcrun simctl list
+      - name: Force Xcode 13.1
+        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Make project
         run: make generate
       - name: Run tests
-        run: make test-iPhone-iOS12
+        run: make test-iPhone-iOS15
 
diff --git a/Makefile b/Makefile
index 105ce37..0fe8901 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 .DEFAULT_GOAL := generate
 
+# Code Signing Settings
+
+NO_CODE_SIGN_SETTINGS = CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+
 # Install Tasks
 
 install-lint:
@@ -23,24 +27,28 @@ test-iPad:
 		xcodebuild \
 		-project Hammer.xcodeproj \
 		-scheme Hammer \
-		-destination "name=iPad Pro (12.9-inch) (4th generation)" \
-		test
+		-destination "name=iPad Pro (12.9-inch) (6th generation)" \
+		test \
+		$(NO_CODE_SIGN_SETTINGS)
 
 test-iPhone:
 	set -o pipefail && \
 		xcodebuild \
 		-project Hammer.xcodeproj \
 		-scheme Hammer \
-		-destination "name=iPhone 11" \
-		test
+		-destination "name=iPhone 15" \
+		test \
+		$(NO_CODE_SIGN_SETTINGS)
 
-test-iPhone-iOS12:
+test-iPhone-iOS15:
 	set -o pipefail && \
 		xcodebuild \
 		-project Hammer.xcodeproj \
 		-scheme Hammer \
-		-destination "name=iPhone 6" \
-		test
+		-destination "name=iPhone 11" \
+		-sdk iphonesimulator15.0 \
+		test \
+		$(NO_CODE_SIGN_SETTINGS)
 
 # List all targets (from https://stackoverflow.com/questions/4219255/how-do-you-get-the-list-of-targets-in-a-makefile)