From a87c29eb8ff6891730374570a85a789994b63786 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 19 Apr 2026 11:22:18 -0700 Subject: [PATCH 1/3] ci: Update Xcode and iOS versions in workflow --- .github/workflows/functional-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index 1f2f703a..7a94906b 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -60,9 +60,9 @@ jobs: # Please make sure the available Xcode versions and iOS versions # on the runner images. https://github.com/actions/runner-images env: - XCODE_VERSION: 16.4 - IOS_VERSION: 18.5 - IOS_DEVICE_NAME: iPhone 16 Plus + XCODE_VERSION: 26.4 + IOS_VERSION: 26.4 + IOS_DEVICE_NAME: iPhone 17 steps: - uses: actions/checkout@v6 @@ -128,9 +128,9 @@ jobs: # Please make sure the available Xcode versions and iOS versions # on the runner images. https://github.com/actions/runner-images env: - XCODE_VERSION: 16.4 - IOS_VERSION: 18.5 - IOS_DEVICE_NAME: iPhone 16 Plus + XCODE_VERSION: 26.4 + IOS_VERSION: 26.4 + IOS_DEVICE_NAME: iPhone 17 steps: - uses: actions/checkout@v6 From c865bd6d7c031fd87908d948ae1b7197e75f7908 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 19 Apr 2026 14:36:45 -0700 Subject: [PATCH 2/3] Update macOS version in functional test workflow --- .github/workflows/functional-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index 7a94906b..39aa9c6f 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -55,7 +55,7 @@ jobs: platform: tvOS wdaName: WebDriverAgentRunner_tvOS-Runner.app - runs-on: macos-15 + runs-on: macos-26 # Please make sure the available Xcode versions and iOS versions # on the runner images. https://github.com/actions/runner-images @@ -80,7 +80,7 @@ jobs: - uses: futureware-tech/simulator-action@v5 with: - # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md + # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md model: ${{ env.IOS_DEVICE_NAME }} os_version: ${{ env.IOS_VERSION }} wait_for_boot: true @@ -123,7 +123,7 @@ jobs: test/report/ ios_test_with_other_deps: - runs-on: macos-15 + runs-on: macos-26 # Please make sure the available Xcode versions and iOS versions # on the runner images. https://github.com/actions/runner-images @@ -148,7 +148,7 @@ jobs: - uses: futureware-tech/simulator-action@v5 with: - # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md + # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md model: ${{ env.IOS_DEVICE_NAME }} os_version: ${{ env.IOS_VERSION }} wait_for_boot: true From 081d352365bfd9e63398194ffee7937e8c40ff72 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Wed, 22 Apr 2026 23:32:54 -0700 Subject: [PATCH 3/3] update test --- test/functional/ios/patch_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/ios/patch_test.rb b/test/functional/ios/patch_test.rb index 059ba6cd..7b9942b9 100644 --- a/test/functional/ios/patch_test.rb +++ b/test/functional/ios/patch_test.rb @@ -55,8 +55,8 @@ def test_location_rel location = e.location_rel @@driver expected_x, expected_y = if over_ios17?(@@driver) - # iPhone 15 Plus - ['64.0 / 430.0', '245.0 / 932.0'] + # iPhone 17 + ['64.0 / 402.0', '245.0 / 932.0'] elsif over_ios14?(@@driver) # iPhone 11 ['64.0 / 414.0', '239.5 / 896.0']