Skip to content

Commit e318e7c

Browse files
committed
[CI] Support Xcode 26
1 parent cfddb24 commit e318e7c

File tree

5 files changed

+28
-56
lines changed

5 files changed

+28
-56
lines changed

.github/workflows/cron-checks.yml

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,28 @@ jobs:
2121
strategy:
2222
matrix:
2323
include:
24-
- ios: 18.5
25-
xcode: 16.4
26-
os: macos-15
24+
- ios: "26.0"
25+
device: "iPhone 17 Pro"
26+
setup_runtime: false
27+
- ios: "18.5"
2728
device: "iPhone 16 Pro"
2829
setup_runtime: false
29-
- ios: 17.5
30-
xcode: 15.4
31-
os: macos-14
30+
- ios: "17.5"
3231
device: "iPhone 15 Pro"
33-
setup_runtime: false
34-
- ios: 16.4
35-
xcode: 15.3 # fails on 15.4
36-
os: macos-14
32+
setup_runtime: true
33+
- ios: "16.4"
3734
device: "iPhone 14 Pro"
3835
setup_runtime: true
39-
- ios: 15.5
40-
xcode: 15.3 # fails on 15.4
41-
os: macos-14
36+
- ios: "15.5"
4237
device: "iPhone 13 Pro"
4338
setup_runtime: true
4439
fail-fast: false
45-
runs-on: ${{ matrix.os }}
40+
runs-on: macos-15
4641
env:
4742
GITHUB_EVENT: ${{ toJson(github.event) }}
4843
ALLURE_TOKEN: ${{ secrets.ALLURE_TOKEN }}
4944
STREAM_DEMO_APP_SECRET: ${{ secrets.STREAM_DEMO_APP_SECRET }}
50-
XCODE_VERSION: ${{ matrix.xcode }}
45+
XCODE_VERSION: "26.0"
5146
IOS_SIMULATOR_DEVICE: "${{ matrix.device }} (${{ matrix.ios }})" # For the Allure report
5247
steps:
5348
- uses: actions/checkout@v4.1.1
@@ -94,30 +89,25 @@ jobs:
9489
strategy:
9590
matrix:
9691
include:
97-
- ios: 18.5
98-
xcode: 16.4
99-
os: macos-15
92+
- ios: "26.0"
93+
device: "iPhone 17 Pro"
94+
setup_runtime: false
95+
- ios: "18.5"
10096
device: "iPhone 16 Pro"
10197
setup_runtime: false
102-
- ios: 17.5
103-
xcode: 15.4
104-
os: macos-14
98+
- ios: "17.5"
10599
device: "iPhone 15 Pro"
106-
setup_runtime: false
107-
- ios: 16.4
108-
xcode: 15.3 # fails on 15.4
109-
os: macos-14
100+
setup_runtime: true
101+
- ios: "16.4"
110102
device: "iPhone 14 Pro"
111103
setup_runtime: true
112-
- ios: 15.5
113-
xcode: 15.3 # fails on 15.4
114-
os: macos-14
104+
- ios: "15.5"
115105
device: "iPhone 13 Pro"
116106
setup_runtime: true
117107
fail-fast: false
118-
runs-on: ${{ matrix.os }}
108+
runs-on: macos-15
119109
env:
120-
XCODE_VERSION: ${{ matrix.xcode }}
110+
XCODE_VERSION: "26.0"
121111
steps:
122112
- uses: actions/checkout@v4.1.1
123113
- uses: ./.github/actions/bootstrap
@@ -147,10 +137,10 @@ jobs:
147137
fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
148138
149139
build-old-xcode:
150-
name: Build LLC + UI (Xcode 15)
151-
runs-on: macos-14
140+
name: Build LLC + UI (Old Xcode)
141+
runs-on: macos-15
152142
env:
153-
XCODE_VERSION: "15.4"
143+
XCODE_VERSION: "16.0"
154144
steps:
155145
- name: Connect Bot
156146
uses: webfactory/ssh-agent@v0.7.0
@@ -175,9 +165,9 @@ jobs:
175165

176166
automated-code-review:
177167
name: Automated Code Review
178-
runs-on: macos-14
168+
runs-on: macos-15
179169
env:
180-
XCODE_VERSION: "15.4"
170+
XCODE_VERSION: "16.0"
181171
steps:
182172
- uses: actions/checkout@v4.1.1
183173
- uses: ./.github/actions/bootstrap

.github/workflows/smoke-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020

2121
env:
2222
HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
23-
IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.5)"
23+
IOS_SIMULATOR_DEVICE: "iPhone 17 Pro (26.0)"
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2525
GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
2626

Githubfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export ALLURECTL_VERSION='2.16.0'
44
export XCRESULTS_VERSION='1.19.1'
55
export YEETD_VERSION='1.0'
66
export GCLOUD_VERSION='464.0.0'
7-
export MINT_VERSION='0.17.5'
87
export SONAR_VERSION='6.2.1.4610'
98
export IPSW_VERSION='3.1.592'
109
export INTERFACE_ANALYZER_VERSION='1.0.7'

fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require 'net/http'
77
import 'Sonarfile'
88
import 'Allurefile'
99

10-
xcode_version = ENV['XCODE_VERSION'] || '16.4'
10+
xcode_version = ENV['XCODE_VERSION'] || '26.0'
1111
xcode_project = 'StreamChat.xcodeproj'
1212
sdk_names = ['StreamChat', 'StreamChatUI']
1313
github_repo = ENV['GITHUB_REPOSITORY'] || 'GetStream/stream-chat-swift'

fastlane/Scanfile

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
# For more information about this configuration visit
2-
# https://docs.fastlane.tools/actions/scan/#scanfile
3-
4-
# In general, you can use the options available
5-
# fastlane scan --help
6-
7-
devices(["iPhone 11"])
8-
9-
# Needed for Sonar
10-
code_coverage(true)
11-
12-
# Our integration tests need to run in parallel
13-
disable_concurrent_testing(true)
14-
15-
configuration("Debug")
16-
1+
configuration('Debug')
172
result_bundle(true)
18-
19-
skip_slack(true)

0 commit comments

Comments
 (0)