Skip to content

Commit 43c2fd2

Browse files
committed
test: use newer xcode/ios
1 parent 61b2277 commit 43c2fd2

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.github/workflows/functional-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
- target: test/functional/ios/tv_driver_test.rb
3434
name: test7
3535

36-
runs-on: macos-14
36+
runs-on: macos-15
3737

3838
# Please make sure the available Xcode versions and iOS versions
3939
# on the runner images. https://github.com/actions/runner-images
4040
env:
41-
XCODE_VERSION: 15.3
42-
IOS_VERSION: 17.4
43-
IOS_DEVICE_NAME: iPhone 15 Plus
41+
XCODE_VERSION: 16.4
42+
IOS_VERSION: 18.5
43+
IOS_DEVICE_NAME: iPhone 16 Plus
4444

4545
steps:
4646
- uses: actions/checkout@v3

test/test_helper.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def self.mac2
131131

132132
# Require a simulator which OS version is 11.4, for example.
133133
def ios(platform_name = :ios)
134-
platform_version = '17.4'
134+
platform_version = ENV['IOS_VERSION'] || '18.5'
135135
wda_port = wda_local_port
136136

137137
real_device = ENV['REAL'] || false
@@ -214,12 +214,7 @@ def device_name(os_version, platform_name, wda_local_port)
214214
if platform_name.downcase == :tvos
215215
'Apple TV'
216216
else
217-
name = if over_ios13?(os_version)
218-
'iPhone 15 Plus'
219-
else
220-
'iPhone 15 Pro Max'
221-
end
222-
217+
name = ENV['IOS_DEVICE_NAME'] || 'iPhone 16 Plus'
223218
parallel? ? "#{name} - #{wda_local_port}" : name
224219
end
225220
end

0 commit comments

Comments
 (0)