From dec9a3d34f5cf9cb3fdcc44b58fc83fc91b06274 Mon Sep 17 00:00:00 2001
From: Mark Murray <mark.murray@shopify.com>
Date: Mon, 25 Nov 2024 11:01:58 +0000
Subject: [PATCH] Fix CI

---
 .github/workflows/deploy.yml        |  2 +-
 .github/workflows/lint.yml          |  4 ++--
 .github/workflows/test-samples.yml  |  2 +-
 .github/workflows/test-workflow.yml |  2 +-
 Scripts/test_samples                | 18 ++++++++++++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 18d10346..569a098c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   cocoapods:
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f951b268..9c605b6f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,14 +16,14 @@ jobs:
 
   check-license-headers:
     name: License Headers
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: ./Scripts/copy_license && git diff --name-only --exit-code
 
   lint-podspec:
     name: CocoaPods
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
diff --git a/.github/workflows/test-samples.yml b/.github/workflows/test-samples.yml
index 566ba464..caf39cf3 100644
--- a/.github/workflows/test-samples.yml
+++ b/.github/workflows/test-samples.yml
@@ -1,4 +1,4 @@
-name: Run Sample App Tests
+name: Build Sample Apps
 
 on:
   push:
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
index a62bf6e5..003e12bc 100644
--- a/.github/workflows/test-workflow.yml
+++ b/.github/workflows/test-workflow.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
       - name: Checkout Repository
diff --git a/Scripts/test_samples b/Scripts/test_samples
index 9c90f2d1..ed8231cf 100755
--- a/Scripts/test_samples
+++ b/Scripts/test_samples
@@ -6,19 +6,29 @@ set -eo pipefail
 if [[ -n $CURRENT_SIMULATOR_UUID ]]; then
     dest="id=$CURRENT_SIMULATOR_UUID"
 else
-    dest="platform=iOS Simulator,name=iPhone 16"
+    dest="platform=iOS Simulator,name=iPhone 14"
 fi
 
 cd Samples/
 
 EMPTY_ENTITLEMENTS="""
-<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\"></plist>
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict/>
+</plist>
 """
 
 build_app() {
     touch "$1/Storefront.xcconfig"
-    echo $EMPTY_ENTITLEMENTS > "$1/$1/$1.entitlements"
+
+    # Create an empty entitlements file if it doesn't already exist
+    if [[ ! -f "$1/$1/$1.entitlements" ]]; then
+        echo $EMPTY_ENTITLEMENTS > "$1/$1/$1.entitlements"
+    else
+        echo "Entitlements file already exists for $1 project."
+    fi
+
     xcodebuild clean build -scheme $1 -sdk iphonesimulator -destination "$dest" -skipPackagePluginValidation | xcpretty -c
 }