diff --git a/.github/workflows/scripts/boot-simulator.sh b/.github/workflows/scripts/boot-simulator.sh index 8858a8f8c6..ead96931e0 100755 --- a/.github/workflows/scripts/boot-simulator.sh +++ b/.github/workflows/scripts/boot-simulator.sh @@ -12,10 +12,10 @@ echo "Attempting to boot iOS Simulator $SIM..." (xcrun simctl boot "$SIM" || true) && open -a Simulator.app # Is it booted? -xcrun simctl list |grep -i 'iPhone 16 ('|grep -v 'Phone:'|grep -v 'unavailable'|grep -v CoreSimulator|grep Booted +xcrun simctl list |grep -i "$SIM ("|grep -v 'Phone:'|grep -v 'unavailable'|grep -v CoreSimulator|grep Booted # Are we a Debug or Release build? BUILDDIR="$(ls -1 ios/build/Build/Products/)" # Install our app (glob so Release or Debug works) -xcrun simctl install 'iPhone 16' "ios/build/Build/Products/$BUILDDIR/testing.app" \ No newline at end of file +xcrun simctl install "$SIM" "ios/build/Build/Products/$BUILDDIR/testing.app" \ No newline at end of file diff --git a/.github/workflows/tests_e2e_ios.yml b/.github/workflows/tests_e2e_ios.yml index e6a1cb80e2..810ba72796 100644 --- a/.github/workflows/tests_e2e_ios.yml +++ b/.github/workflows/tests_e2e_ios.yml @@ -86,7 +86,7 @@ jobs: # it will run unit tests on whatever OS combinations are desired ios: name: iOS (${{ matrix.buildmode }}, ${{ matrix.iteration }}) - runs-on: macos-15 + runs-on: macos-26 needs: matrix_prep # TODO matrix across APIs, at least 11 and 15 (lowest to highest) timeout-minutes: 60 diff --git a/.github/workflows/tests_e2e_other.yml b/.github/workflows/tests_e2e_other.yml index 2299bbcb42..735e95d3a1 100644 --- a/.github/workflows/tests_e2e_other.yml +++ b/.github/workflows/tests_e2e_other.yml @@ -82,7 +82,7 @@ jobs: # it will run unit tests on whatever OS combinations are desired other: name: Other (${{ matrix.iteration }}) - runs-on: macos-15 + runs-on: macos-26 needs: matrix_prep timeout-minutes: 100 env: diff --git a/tests/.detoxrc.js b/tests/.detoxrc.js index 0cb069abf1..1bbbbf02f2 100644 --- a/tests/.detoxrc.js +++ b/tests/.detoxrc.js @@ -48,7 +48,7 @@ module.exports = { simulator: { type: 'ios.simulator', device: { - type: 'iPhone 16', + type: 'iPhone 17', }, }, attached: {