Refactors

Author: orchetect

action.yml

@@ -34,16 +34,15 @@ runs:
     # Workaround for Xcode/GitHub runner issues finding simulators.
     # see https://github.com/actions/runner-images/issues/12758#issuecomment-3206748945
     - name: Refresh Simulators
-      run: Refresh Simulators |
-        echo "Refreshing simulators...\n"
-        LIST=$(xcrun simctl list)
+      run: $GITHUB_ACTION_PATH/scripts/refresh.sh
       shell: bash
       if: inputs.refresh == 'true'
+      env:
+        GITHUB_ACTION_PATH: ${{ github.action_path }}
 
     - name: Parse Inputs
       id: parse-inputs
-      run: Parse Inputs |
-        "$GITHUB_ACTION_PATH/scripts/parse-inputs.sh"
+      run: $GITHUB_ACTION_PATH/scripts/parse-inputs.sh
       shell: bash
       env:
         GITHUB_ACTION_PATH: ${{ github.action_path }}
@@ -62,19 +61,16 @@ runs:
     # Workaround for Xcode/GitHub runner issues finding simulators.
     # see https://github.com/actions/runner-images/issues/12758#issuecomment-3206748945
     - name: Download Simulator for Platform
-      run: Download Simulator for Platform |
-        echo "Downloading simulator if needed...\n"
-        LOG=$(xcodebuild -downloadPlatform "$SIMPLATFORM")
+      run: $GITHUB_ACTION_PATH/scripts/download.sh
       shell: bash
       if: inputs.download == 'true'
       env:
+        GITHUB_ACTION_PATH: ${{ github.action_path }}
         SIMPLATFORM: ${{ steps.parse-inputs.outputs.parsed-platform }}
 
     - name: Find Simulator ID
       id: id-finder
-      run: Find Simulator ID |
-        echo "Finding matching device simulator..."
-        "$GITHUB_ACTION_PATH/scripts/id.sh"
+      run: $GITHUB_ACTION_PATH/scripts/id.sh
       shell: bash
       env:
         GITHUB_ACTION_PATH: ${{ github.action_path }}

scripts/download.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Workaround for Xcode/GitHub runner issues finding simulators.
+# see https://github.com/actions/runner-images/issues/12758#issuecomment-3206748945
+
+# Inputs:
+# - SIMPLATFORM          required
+
+# Step outputs produced:
+# (none)
+
+echo "Downloading simulator if needed..."
+echo ""
+
+# Capture output so it doesn't spam the console. In future this can optionally be printed to the console.
+LOG=$(xcodebuild -downloadPlatform "$SIMPLATFORM")
+
+echo "Done downloading simulator."
+echo ""

scripts/id.sh

@@ -23,6 +23,8 @@
 # Note that validation of variables is skipped in this script, as validation already occurred
 # in the action step that runs parse-inputs.sh.
 
+echo "Finding matching device simulator..."
+
 # Get full list of all available device simulators installed in the system that are applicable for the given Xcode scheme.
 XCODE_OUTPUT=$(xcodebuild -showdestinations -workspace "$WORKSPACEPATH" -scheme "$SCHEME")
 XCODE_OUTPUT_REGEX="m/\{\splatform:(.*\sSimulator),.*id:([A-F0-9\-]{36}),.*OS:(\d{1,2}\.\d),.*name:([a-zA-Z0-9\(\)\s]*)\s\}/g"

scripts/refresh.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Workaround for Xcode/GitHub runner issues finding simulators.
+# see https://github.com/actions/runner-images/issues/12758#issuecomment-3206748945
+
+# Inputs:
+# (none)
+
+# Step outputs produced:
+# (none)
+
+echo "Refreshing simulators..."
+echo ""
+
+# Capture output so it doesn't spam the console. In future this can optionally be printed to the console.
+LIST=$(xcrun simctl list)
+
+echo "Done refreshing simulators."
+echo ""