Skip to content

Commit

Permalink
test(deps): adopt Xcode 15 / iOS 17 in CI
Browse files Browse the repository at this point in the history
- update our device type / os definitions to be iPhone 15 / iOS 17.0

This is to match with the current new installation values you get when installing
Xcode 15 - iPhone 14 / iOS 16.4 are not available by default and you have to install
them manually if you want them

- update CI xcode from xcode-current to 15

- update Detox with patch to handle slightly different error message for terminateApp
  when app was not running - Xcode 15 apparently changed it
  • Loading branch information
mikehardy committed Sep 19, 2023
1 parent e3a93bc commit fb34309
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests_e2e_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: 'latest-stable'
xcode-version: '15'

- uses: actions/checkout@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@
"build": "set -o pipefail && xcodebuild VALID_ARCHS=\"`uname -m`\" CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ -workspace ios/testing.xcworkspace -scheme testing -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build | xcbeautify",
"type": "ios.simulator",
"device": {
"type": "iPhone 14",
"os": "iOS 16.4"
"type": "iPhone 15",
"os": "iOS 17.0"
}
},
"ios.sim.release": {
"binaryPath": "ios/build/Build/Products/Release-iphonesimulator/testing.app",
"build": "export RCT_NO_LAUNCH_PACKAGER=true && set -o pipefail | xcodebuild CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ -workspace ios/testing.xcworkspace -scheme testing -configuration Release -sdk iphonesimulator -derivedDataPath ios/build | xcbeautify",
"type": "ios.simulator",
"device": {
"type": "iPhone 14",
"os": "iOS 16.4"
"type": "iPhone 15",
"os": "iOS 17.0"
}
},
"android.emu.debug": {
Expand Down
13 changes: 13 additions & 0 deletions tests/patches/detox+19.12.6.patch
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,16 @@ index fb4b820..d2dc87d 100644
notifyIdle()
return true
}
diff --git a/node_modules/detox/src/devices/common/drivers/ios/tools/AppleSimUtils.js b/node_modules/detox/src/devices/common/drivers/ios/tools/AppleSimUtils.js
index 585c99b..46e4b83 100644
--- a/node_modules/detox/src/devices/common/drivers/ios/tools/AppleSimUtils.js
+++ b/node_modules/detox/src/devices/common/drivers/ios/tools/AppleSimUtils.js
@@ -272,7 +272,7 @@ class AppleSimUtils {
// want to make sure it isn't now.
if (err.code === 3 &&
(err.stderr.includes(`the app is not currently running`) ||
- err.stderr.includes(`The operation couldn’t be completed. found nothing to terminate`))) {
+ err.stderr.includes(`found nothing to terminate`))) {
return;
}

0 comments on commit fb34309

Please sign in to comment.