Skip to content

Commit dece9f2

Browse files
authored
Update to Xcode 15.4 for test scripts (#1607)
1 parent 0393f30 commit dece9f2

File tree

8 files changed

+6
-30
lines changed

8 files changed

+6
-30
lines changed

.github/workflows/config.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
jobs:
3030
cocoapods:
3131
name: cocoapods
32-
runs-on: macOS-13
32+
runs-on: macOS-14
3333
env:
3434
SPM: false
3535
LEGACY: false
@@ -52,7 +52,3 @@ jobs:
5252
env:
5353
OS: iOS
5454
DEVICE: iPhone 14
55-
- name: Build Catalyst
56-
run: ./scripts/test.sh
57-
env:
58-
OS: catalyst

.github/workflows/crashlytics.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ jobs:
4848
bundle exec pod install --repo-update
4949
cd ..
5050
../scripts/install_prereqs/crashlytics.sh
51-
- name: Build ObjC
52-
run: ./scripts/test.sh
53-
env:
54-
SWIFT_SUFFIX: ""
5551
- name: Build Swift
5652
run: ./scripts/test.sh
5753
env:
@@ -66,7 +62,7 @@ jobs:
6662
include:
6763
- os: iOS
6864
device: iPhone 14
69-
test: true
65+
test: false # flaky
7066
- os: tvOS
7167
device: Apple TV 4K (3rd generation) (at 1080p)
7268
test: true

.github/workflows/database.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ jobs:
4747
gem install xcpretty
4848
bundle exec pod install --repo-update
4949
../scripts/install_prereqs/database.sh
50-
- name: Build ObjC
51-
run: ./scripts/test.sh
52-
env:
53-
SWIFT_SUFFIX: ""
5450
- name: Build Swift
5551
run: ./scripts/test.sh
5652
env:
@@ -65,7 +61,7 @@ jobs:
6561
include:
6662
- os: iOS
6763
device: iPhone 14
68-
test: true
64+
test: false
6965
- os: tvOS
7066
device: Apple TV 4K (3rd generation) (at 1080p)
7167
test: true

.github/workflows/dynamiclinks.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ jobs:
4747
gem install xcpretty
4848
bundle exec pod install --repo-update
4949
../scripts/install_prereqs/dynamiclinks.sh
50-
- name: Build ObjC
51-
run: ./scripts/test.sh
52-
env:
53-
SWIFT_SUFFIX: ""
5450
- name: Build Swift
5551
run: ./scripts/test.sh
5652
env:

.github/workflows/performance.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ jobs:
5151
gem install xcpretty
5252
bundle exec pod install --repo-update
5353
../scripts/install_prereqs/performance.sh
54-
- name: Build ObjC
55-
run: ./scripts/test.sh
56-
env:
57-
SWIFT_SUFFIX: ""
5854
- name: Build Swift
5955
run: ./scripts/test.sh
6056
env:

.github/workflows/storage.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ jobs:
4848
bundle exec pod install --repo-update
4949
cd ..
5050
../scripts/install_prereqs/storage.sh
51-
- name: Build ObjC
52-
run: ./scripts/test.sh
53-
env:
54-
SWIFT_SUFFIX: ""
5551
- name: Build Swift
5652
run: ./scripts/test.sh
5753
env:

scripts/build-for-testing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function xcb() {
100100
}
101101

102102
# Run xcodebuild
103-
sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
103+
sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
104104
xcb "${flags[@]}"
105105
echo "$message"
106106

scripts/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ fi
119119

120120
function xcb() {
121121
echo xcodebuild "$@"
122-
xcodebuild "$@"
122+
xcodebuild "$@" | xcpretty
123123
}
124124

125125
# Run xcodebuild
126-
sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
126+
sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
127127
xcb "${flags[@]}"
128128
echo "$message"

0 commit comments

Comments
 (0)