Refactor: Unify build & test scripts / workflows (#311)

* feat: add shared build and test script

* feat: add xcode_run script to wrap test/build

* refactor: rename test-samples -> build-samples

* feat: make xcode_run more permissive on actions

* feat: use xcode_run in other scripts

* refactor: rename test-sdk -> test-package

* feat: add xcbeautify to dev.yml

* feat: add dev commands for building & testing

* refactor: remove test_package script

* fix: cleanup reference to test_package

Author: kieran-osgood-shopify

.github/workflows/test-samples.yml renamed to .github/workflows/build-samples.yml

@@ -11,4 +11,4 @@ jobs:
   call-workflow-passing-data:
     uses: ./.github/workflows/test-workflow.yml
     with:
-      test-path: ./Scripts/test_samples
+      test-path: ./Scripts/build_samples

.github/workflows/test-sdk.yml renamed to .github/workflows/test-package.yml

@@ -1,4 +1,4 @@
-name: Run SDK Tests
+name: Run Package Tests
 
 on:
   push:
@@ -11,4 +11,4 @@ jobs:
   call-workflow-passing-data:
     uses: ./.github/workflows/test-workflow.yml
     with:
-      test-path: ./Scripts/test_package
+      test-path: ./scripts/xcode_run test ShopifyCheckoutSheetKit

.github/workflows/test-workflow.yml

@@ -20,7 +20,7 @@ jobs:
           xcrun simctl list runtimes
           xcrun simctl list devicetypes
           xcrun simctl delete all
-          CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 14")
+          CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 16")
           echo "CURRENT_SIMULATOR_UUID=$CURRENT_SIMULATOR_UUID" >> $GITHUB_ENV
 
       - name: Run Tests

Scripts/test_samples renamed to Scripts/build_samples

@@ -3,11 +3,7 @@
 set -ex
 set -eo pipefail
 
-if [[ -n $CURRENT_SIMULATOR_UUID ]]; then
-    dest="id=$CURRENT_SIMULATOR_UUID"
-else
-    dest="platform=iOS Simulator,name=iPhone 14"
-fi
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 cd Samples/
 
@@ -29,7 +25,7 @@ build_app() {
         echo "Entitlements file already exists for $1 project."
     fi
 
-    xcodebuild clean build -scheme $1 -sdk iphonesimulator -destination "$dest" -skipPackagePluginValidation | xcpretty -c
+    $SCRIPT_DIR/xcode_run "clean build" $1 
 }
 
 build_app MobileBuyIntegration

Scripts/get_device_id

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Check if device type was provided
+if [ $# -lt 1 ]; then
+  echo "Usage: $0 <device_type> [model_keywords...]"
+  echo "Example: $0 iPhone 16"
+  echo "Example: $0 iPad Pro"
+  echo "Example: $0 iPad Pro 11-inch"
+  exit 1
+fi
+
+DEVICE_TYPE="$1"
+shift
+
+# Join the remaining arguments to build a search pattern
+SEARCH=""
+if [ $# -gt 0 ]; then
+  SEARCH="$*"
+fi
+
+# List all devices and filter
+if [ -n "$SEARCH" ]; then
+  # Create a search string with spaces to match exact model (case insensitive)
+  DEVICES=$(xcrun simctl list devices | grep -i "$DEVICE_TYPE")
+  
+  # Use grep to find lines containing all search terms (case insensitive)
+  for term in $SEARCH; do
+    DEVICES=$(echo "$DEVICES" | grep -i "$term")
+  done
+  
+  # Get the first matching device
+  DEVICE_ID=$(echo "$DEVICES" | head -1 | sed -E 's/.*\(([A-Z0-9-]+)\).*/\1/')
+else
+  # If no model specified, get the first device of the type (case insensitive)
+  DEVICE_ID=$(xcrun simctl list devices | grep -i "$DEVICE_TYPE" | head -1 | sed -E 's/.*\(([A-Z0-9-]+)\).*/\1/')
+fi
+
+# Check if identifier was found
+if [ -z "$DEVICE_ID" ]; then
+  echo "Device not found: $DEVICE_TYPE $SEARCH"
+  exit 1
+fi
+
+echo "$DEVICE_ID"

Scripts/test_package

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+set -eo pipefail
+
+# Get action from first argument, default to build
+ACTION="${1:-build}"
+
+# Get scheme name from second argument, default to ShopifyCheckoutSheetKit
+SCHEME="${2:-ShopifyCheckoutSheetKit}"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Validate action contains at least one of: build, test, or clean
+if [[ "$ACTION" != *"build"* && "$ACTION" != *"test"* && "$ACTION" != *"clean"* ]]; then
+    echo "Error: ACTION must contain 'build', 'test', or 'clean', got '$ACTION'"
+    exit 1
+fi
+
+if [[ -n $CURRENT_SIMULATOR_UUID ]]; then
+    dest="id=$CURRENT_SIMULATOR_UUID"
+else
+    # Get a valid iPhone simulator ID using get_device_id.sh
+    DEVICE_ID=$("$SCRIPT_DIR/get_device_id" "iPhone 16")
+    dest="id=$DEVICE_ID"
+fi
+
+xcodebuild_cmd="xcodebuild $ACTION -scheme $SCHEME -sdk iphonesimulator -destination \"$dest\" -skipPackagePluginValidation"
+
+if command -v xcbeautify >/dev/null 2>&1; then
+    eval "$xcodebuild_cmd" | xcbeautify
+else
+    eval "$xcodebuild_cmd"
+fi

Scripts/xcode_run

@@ -20,6 +20,7 @@ packages:
   - homebrew:
       - swiftlint
       - swiftformat
+      - xcbeautify
 
 commands:
   lint:
@@ -29,3 +30,12 @@ commands:
   fix:
     desc: Autofix Format & Lint issues
     run: scripts/lint fix
+  build_package:
+    desc: Build the Package
+    run: ./scripts/xcode_run build ShopifyCheckoutSheetKit
+  build_samples:
+    desc: Build the Samples
+    run: ./scripts/build_samples
+  test_package:
+    desc: Test the Package
+    run: ./scripts/xcode_run test ShopifyCheckoutSheetKit