Skip to content

Commit a45421c

Browse files
authored
Merge pull request #211 from analogcode/fix/ci-simulator-name
Fix CI builds by using iPhone 17 Pro simulator
2 parents 2fcd07a + 3e73583 commit a45421c

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/carplay.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ jobs:
3333
scheme: ${{ 'default' }}
3434
platform: ${{ 'iOS Simulator' }}
3535
run: |
36-
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
37-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
3836
if [ $scheme = default ]; then scheme=$(cat default); fi
3937
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
4038
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
41-
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
39+
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=iPhone 17 Pro"

.github/workflows/ios.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ jobs:
3333
scheme: ${{ 'default' }}
3434
platform: ${{ 'iOS Simulator' }}
3535
run: |
36-
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
37-
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
3836
if [ $scheme = default ]; then scheme=$(cat default); fi
3937
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
4038
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
41-
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
39+
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=iPhone 17 Pro"
4240
# Disable testing for now
4341
# - name: Test
4442
# env:

0 commit comments

Comments
 (0)