ios rename

parse-community · Jan 27, 2025 · d69ff7a · d69ff7a
1 parent 095b2f1
commit d69ff7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -110,32 +110,34 @@ jobs:
           - name: Xcode 15
             script: build:starters
             iosVersion: '17.5'
-            deviceModel: iPhone 15
+            iosDeviceModel: iPhone 15
+            watchOsVersion: '11.2'
+            watchDeviceModel: Apple Watch Series 10 (46mm)
             developerDir: CI_XCODE_15
           - name: Xcode 16
             script: build:starters
             iosVersion: '18.1'
-            deviceModel: iPhone 16
+            iosDeviceModel: iPhone 16
             developerDir: CI_XCODE_16
           - name: Core Module, iOS 17
             script: test:ios
             iosVersion: '17.5'
-            deviceModel: iPhone 15
+            iosDeviceModel: iPhone 15
             developerDir: CI_XCODE_16
           - name: LiveQuery Module, iOS 17
             script: test:parse_live_query:ios
             iosVersion: '17.5'
-            deviceModel: iPhone 15
+            iosDeviceModel: iPhone 15
             developerDir: CI_XCODE_16
           - name: Core Module, iOS 18
             script: test:ios
             iosVersion: '18.1'
-            deviceModel: iPhone 16
+            iosDeviceModel: iPhone 16
             developerDir: CI_XCODE_16
           - name: LiveQuery Module, iOS 18
             script: test:parse_live_query:ios
             iosVersion: '18.1'
-            deviceModel: iPhone 16
+            iosDeviceModel: iPhone 16
             developerDir: CI_XCODE_16
           - name: Core Module, macOS 14
             script: test:macos
@@ -198,7 +200,7 @@ jobs:
       - name: Submodules
         run: git submodule update --init --recursive
       - name: Build-Test
-        run: set -o pipefail && env NSUnbufferedIO=YES IOS_VERSION="${{ matrix.iosVersion }}" DEVICE_MODEL="${{ matrix.deviceModel }}" WATCH_DEVICE_MODEL="${{ matrix.watchDeviceModel }}" WATCH_OS_VERSION="${{ matrix.watchOsVersion }}" TV_DEVICE_MODEL="${{ matrix.tvDeviceModel }}" TV_OS_VERSION="${{ matrix.tvOsVersion }}" bundle exec rake ${{ matrix.script }}
+        run: set -o pipefail && env NSUnbufferedIO=YES IOS_VERSION="${{ matrix.iosVersion }}" IOS_DEVICE_MODEL="${{ matrix.iosDeviceModel }}" WATCH_DEVICE_MODEL="${{ matrix.watchDeviceModel }}" WATCH_OS_VERSION="${{ matrix.watchOsVersion }}" TV_DEVICE_MODEL="${{ matrix.tvDeviceModel }}" TV_OS_VERSION="${{ matrix.tvOsVersion }}" bundle exec rake ${{ matrix.script }}
         env:
           DEVELOPER_DIR: ${{ env[matrix.developerDir] }}
       - name: Generate Environment Variables

diff --git a/Rakefile b/Rakefile
@@ -12,7 +12,7 @@ require_relative 'Vendor/xctoolchain/Scripts/xctask/build_task'
 SCRIPT_PATH = File.expand_path(File.dirname(__FILE__))
 starters_path = File.join(SCRIPT_PATH, 'ParseStarterProject')
 
-ios_simulator = "platform=\"iOS Simulator\",name=\"#{ENV['DEVICE_MODEL'] || 'iPhone 16'}\",OS=\"#{ENV['IOS_VERSION'] || '17.0'}\""
+ios_simulator = "platform=\"iOS Simulator\",name=\"#{ENV['IOS_DEVICE_MODEL'] || 'iPhone 16'}\",OS=\"#{ENV['IOS_VERSION'] || '17.0'}\""
 tvos_simulator = "platform=\"tvOS Simulator\",name=\"#{ENV['TV_DEVICE_MODEL'] || 'Apple TV'}\",OS=\"#{ENV['TV_OS_VERSION'] || 'latest'}\""
 watchos_simulator = "platform=\"watchOS Simulator\",name=\"#{ENV['WATCH_DEVICE_MODEL'] || 'Apple Watch Series 10 (46mm)'}\",OS=\"#{ENV['WATCH_OS_VERSION'] || '8.0'}\""