more fixes

Author: mykola-mokhnach

.github/actions/xcode-setup/action.yml

@@ -2,9 +2,6 @@ name: 'Setup Xcode Test Environment'
 description: 'Common setup steps for Xcode tests'
 
 inputs:
-  node_version:
-    description: 'Node.js version to use'
-    required: true
   xcode_version:
     description: 'Xcode version to use'
     required: true
@@ -18,7 +15,7 @@ runs:
   steps:
     - uses: actions/setup-node@v6
       with:
-        node-version: ${{ inputs.node_version }}
+        node-version: lts/*
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: ${{ inputs.xcode_version }}

.github/workflows/wda-tests.yml

@@ -21,7 +21,6 @@ env:
   MAX_IPHONE_DEVICE_NAME: "iPhone 17"
   MAX_TV_DEVICE_NAME: "Apple TV 4K (3rd generation)"
   MAX_IPAD_DEVICE_NAME: "iPad Air 11-inch (M2)"
-  DEFAULT_NODE_VERSION: "22.x"
 
 jobs:
   build_matrix:
@@ -118,7 +117,6 @@ jobs:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/xcode-setup
         with:
-          node_version: ${{ env.DEFAULT_NODE_VERSION }}
           xcode_version: ${{ matrix.config.xcode_version }}
       - name: Build
         run: ./Scripts/build.sh
@@ -146,7 +144,6 @@ jobs:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/xcode-setup
         with:
-          node_version: ${{ env.DEFAULT_NODE_VERSION }}
           xcode_version: ${{ matrix.config.xcode_version }}
       - name: Analyze
         run: ./Scripts/build.sh
@@ -172,7 +169,6 @@ jobs:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/xcode-setup
         with:
-          node_version: ${{ env.DEFAULT_NODE_VERSION }}
           xcode_version: ${{ matrix.config.xcode_version }}
       - name: Run unit tests
         run: ./Scripts/build.sh
@@ -197,7 +193,6 @@ jobs:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/xcode-setup
         with:
-          node_version: ${{ env.DEFAULT_NODE_VERSION }}
           xcode_version: ${{ matrix.config.xcode_version }}
       - name: Start iOS Simulator UI
         run: open -Fn "$(xcode-select --print-path)/Applications/Simulator.app"

Fastlane/Fastfile

@@ -7,7 +7,8 @@ lane :test do
     fail_build: true,
     scheme: ENV['SCHEME'],
     sdk: ENV['SDK'],
-    destination: ENV['DEST'],
+    device: ENV['DEVICE'],
+    os_version: ENV['OS_VERSION'],
     number_of_retries: 3
   )
 end

Scripts/build.sh

@@ -21,9 +21,9 @@ function define_xc_macros() {
   esac
 
   case "${DEST:-}" in
-    "iphone" ) XC_DESTINATION="name=`echo $IPHONE_MODEL | tr -d "'"`,OS=$IOS_VERSION";;
-    "ipad" ) XC_DESTINATION="name=`echo $IPAD_MODEL | tr -d "'"`,OS=$IOS_VERSION";;
-    "tv" ) XC_DESTINATION="name=`echo $TV_MODEL | tr -d "'"`,OS=$TV_VERSION";;
+    "iphone" ) XC_DESTINATION="platform=iOS Simulator,name=`echo $IPHONE_MODEL | tr -d "'"`,OS=$IOS_VERSION";;
+    "ipad" ) XC_DESTINATION="platform=iOS Simulator,name=`echo $IPAD_MODEL | tr -d "'"`,OS=$IOS_VERSION";;
+    "tv" ) XC_DESTINATION="platform=tvOS Simulator,name=`echo $TV_MODEL | tr -d "'"`,OS=$TV_VERSION";;
     "generic" ) XC_DESTINATION="generic/platform=iOS";;
     "tv_generic" ) XC_DESTINATION="generic/platform=tvOS" XC_MACROS="${XC_MACROS} ARCHS=arm64";; # tvOS only supports arm64
   esac
@@ -85,13 +85,31 @@ function xcbuild() {
 }
 
 function fastlane_test() {
-  bundle install
-
-  if [[ -n "$XC_DESTINATION" ]]; then
-    SDK="$XC_SDK" DEST="$XC_DESTINATION" SCHEME="$1" bundle exec fastlane test
-  else
-    SDK="$XC_SDK" SCHEME="$1" bundle exec fastlane test
+  # Skip bundle install if already installed (CI already does this)
+  if ! bundle check &>/dev/null; then
+    bundle install
   fi
+
+  case "${DEST:-}" in
+    "iphone" )
+      FASTLANE_DEVICE=$(echo $IPHONE_MODEL | tr -d "'")
+      FASTLANE_OS_VERSION="$IOS_VERSION"
+      ;;
+    "ipad" )
+      FASTLANE_DEVICE=$(echo $IPAD_MODEL | tr -d "'")
+      FASTLANE_OS_VERSION="$IOS_VERSION"
+      ;;
+    "tv" )
+      FASTLANE_DEVICE=$(echo $TV_MODEL | tr -d "'")
+      FASTLANE_OS_VERSION="$TV_VERSION"
+      ;;
+    * )
+      echo "Error: Unknown DEST value '${DEST:-}'. DEST must be one of: iphone, ipad, tv"
+      exit 1
+      ;;
+  esac
+
+  SDK="$XC_SDK" DEVICE="$FASTLANE_DEVICE" OS_VERSION="$FASTLANE_OS_VERSION" SCHEME="$1" bundle exec fastlane test
 }
 
 define_xc_macros