Refactored to also output platform-short and workspace-path

Author: orchetect

action.yml

@@ -24,12 +24,18 @@ inputs:
     required: false
 
 outputs:
-  destination-platform:
-    description: "Platform"
-    value: ${{ steps.parse-inputs.outputs.parsed-platform }}
-  destination-id:
-    description: "Simulator ID"
+  id:
+    description: "Destination Simulator ID"
     value: ${{ steps.id-finder.outputs.id }}
+  platform:
+    description: "Destination Platform"
+    value: ${{ steps.id-finder.outputs.platform }}
+  platform-short:
+    description: "Platform (Short)"
+    value: ${{ steps.id-finder.outputs.platform-short }}
+  workspace-path:
+    description: "Xcode workspace path relative to repo root"
+    value: ${{ steps.id-finder.outputs.workspace-path }}
 
 runs:
   using: "composite"
@@ -82,9 +88,11 @@ runs:
         SIMDEVICE_REGEX: ${{ steps.parse-inputs.outputs.parsed-device-regex }}
         OSVERSION_REGEX: ${{ steps.parse-inputs.outputs.parsed-os-version-regex }}
       # outputs:
-      #  destination-platform
-      #  destination-id
-
+      #  id
+      #  platform
+      #  platform-short
+      #  workspace-path
+      
 branding:
   icon: 'code'
   color: 'blue'

scripts/id.sh

@@ -10,7 +10,7 @@
 # - https://docs.github.com/en/actions/how-tos/create-and-publish-actions/set-exit-codes
 
 # Inputs:
-# - WORKSPACEPATH           optional
+# - WORKSPACEPATH           required
 # - SCHEME                  required
 # - SIMPLATFORM             required
 # - SIMPLATFORM_SHORT       required
@@ -19,8 +19,10 @@
 # - OSVERSION_REGEX         optional
 
 # Step outputs produced:
-# - destination-platform    Platform string (ie: "iOS Simulator") which can be used verbatim in `xcodebuild destination="platform=X"` in place of X
-# - destination-id          ID string (ie: "17FC425F-F336-48DC-8D5A-05DA7BCF7B7D") which can be used verbatim in `xcodebuild destination="id=X"` in place of X
+# - id
+# - platform
+# - platform-short
+# - workspace-path
 
 # Note that validation of variables is skipped in this script, as validation already occurred
 # in the action step that runs parse-inputs.sh.
@@ -60,5 +62,7 @@ if [[ -z $DESTID ]]; then echo "⛔️ Error: No matching simulators available."
 echo "🟢 Found device simulator: $DESTDESC"
 
 # Set output variable.
-echo "destination-platform=$(echo $SIMPLATFORM)" >> $GITHUB_OUTPUT
-echo "destination-id=$(echo $DESTID)" >> $GITHUB_OUTPUT
+echo "id=$(echo $DESTID)" >> $GITHUB_OUTPUT
+echo "platform=$(echo $SIMPLATFORM)" >> $GITHUB_OUTPUT
+echo "platform-short=$(echo $SIMPLATFORM_SHORT)" >> $GITHUB_OUTPUT
+echo "workspace-path=$(echo $WORKSPACEPATH)" >> $GITHUB_OUTPUT

scripts/parse-inputs.sh

@@ -7,13 +7,13 @@
 # - INPUT_OSVERSION      optional
 
 # Step outputs produced:
-# - parsed-workspace-path    Relative path to .xcworkspace file from repo root
-# - parsed-scheme            Xcode scheme name
+# - parsed-device-regex      Device name regex used when parsing simulator list output from `xcodebuild -showdestinations`
+# - parsed-os-version-regex  OS version regex used when parsing simulator list output from `xcodebuild -showdestinations` (Optional)
 # - parsed-platform          Platform string (ie: "iOS Simulator") which can be used verbatim in `xcodebuild destination="platform=X"` in place of X
 # - parsed-platform-short    Platform short name (ie: "iOS")
-# - parsed-platform-regex    Platform name regex used when parsing simulator list output from `xcodebuild -showdestinations``
-# - parsed-device-regex
-# - parsed-os-version-regex
+# - parsed-platform-regex    Platform name regex used when parsing simulator list output from `xcodebuild -showdestinations`
+# - parsed-scheme            Xcode scheme name
+# - parsed-workspace-path    Relative path to .xcworkspace file from repo root
 
 # Setup workspace path.
 if [[ -z $INPUT_WORKSPACEPATH ]]; then
@@ -200,10 +200,10 @@ echo "Using platform name regex: $SIMPLATFORM_REGEX"
 echo "Using device name regex: $SIMDEVICE_REGEX"
 
 # Set output variables.
-echo "parsed-workspace-path=$(echo $WORKSPACEPATH)" >> $GITHUB_OUTPUT
-echo "parsed-scheme=$(echo $SCHEME)" >> $GITHUB_OUTPUT
+echo "parsed-device-regex=$(echo $SIMDEVICE_REGEX)" >> $GITHUB_OUTPUT
+echo "parsed-os-version-regex=$(echo $OSVERSION_REGEX)" >> $GITHUB_OUTPUT
 echo "parsed-platform=$(echo $SIMPLATFORM)" >> $GITHUB_OUTPUT
 echo "parsed-platform-short=$(echo $SIMPLATFORM_SHORT)" >> $GITHUB_OUTPUT
 echo "parsed-platform-regex=$(echo $SIMPLATFORM_REGEX)" >> $GITHUB_OUTPUT
-echo "parsed-device-regex=$(echo $SIMDEVICE_REGEX)" >> $GITHUB_OUTPUT
-echo "parsed-os-version-regex=$(echo $OSVERSION_REGEX)" >> $GITHUB_OUTPUT
+echo "parsed-scheme=$(echo $SCHEME)" >> $GITHUB_OUTPUT
+echo "parsed-workspace-path=$(echo $WORKSPACEPATH)" >> $GITHUB_OUTPUT