Skip to content

Commit c52287c

Browse files
Merge pull request #2243 from DataDog/maxep/RUM-7564/ci-update-xcode
RUM-7564 Update CI to Xcode 16.2 Co-authored-by: maxep <maxime.epain@datadoghq.com>
2 parents 51276d8 + 4a946d4 commit c52287c

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

.gitlab-ci.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ variables:
1515
MAIN_BRANCH: "master"
1616
DEVELOP_BRANCH: "develop"
1717
# Default Xcode and runtime versions for all jobs:
18-
DEFAULT_XCODE: "15.4.0"
19-
DEFAULT_IOS_OS: "17.5"
20-
DEFAULT_TVOS_OS: "17.5"
18+
DEFAULT_XCODE: "16.2.0"
19+
DEFAULT_IOS_OS: "18.3.1"
20+
DEFAULT_TVOS_OS: "18.2"
2121
# Prefilled variables for running a pipeline manually:
2222
# Ref.: https://docs.gitlab.com/ee/ci/pipelines/index.html#prefill-variables-in-manual-pipelines
2323
RELEASE_GIT_TAG:
@@ -99,7 +99,7 @@ Unit Tests (iOS):
9999
- !reference [.release-pipeline-job, rules]
100100
variables:
101101
PLATFORM: "iOS Simulator"
102-
DEVICE: "iPhone 15 Pro"
102+
DEVICE: "iPhone 16 Pro"
103103
script:
104104
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE"
105105
- make clean repo-setup ENV=ci
@@ -125,7 +125,7 @@ UI Tests:
125125
- !reference [.release-pipeline-job, rules]
126126
variables:
127127
PLATFORM: "iOS Simulator"
128-
DEVICE: "iPhone 15 Pro"
128+
DEVICE: "iPhone 16 Pro"
129129
parallel:
130130
matrix:
131131
- TEST_PLAN:
@@ -145,6 +145,7 @@ SR Snapshot Tests:
145145
- !reference [.release-pipeline-job, rules]
146146
variables:
147147
PLATFORM: "iOS Simulator"
148+
IOS_OS: "17.5"
148149
DEVICE: "iPhone 15"
149150
ARTIFACTS_PATH: "artifacts"
150151
artifacts:
@@ -155,7 +156,7 @@ SR Snapshot Tests:
155156
script:
156157
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE" --ssh
157158
- make clean repo-setup ENV=ci
158-
- make sr-snapshots-pull sr-snapshot-test OS="$DEFAULT_IOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE" ARTIFACTS_PATH="$ARTIFACTS_PATH"
159+
- make sr-snapshots-pull sr-snapshot-test OS="$IOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE" ARTIFACTS_PATH="$ARTIFACTS_PATH"
159160

160161
Tools Tests:
161162
stage: test
@@ -189,7 +190,7 @@ Smoke Tests (iOS):
189190
- !reference [.release-pipeline-job, rules]
190191
variables:
191192
PLATFORM: "iOS Simulator"
192-
DEVICE: "iPhone 15 Pro"
193+
DEVICE: "iPhone 16 Pro"
193194
script:
194195
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE" --ssh
195196
- make clean repo-setup ENV=ci
@@ -206,7 +207,7 @@ Smoke Tests (tvOS):
206207
script:
207208
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE" --ssh
208209
- make clean repo-setup ENV=ci
209-
- make smoke-test-tvos-all OS="$DEFAULT_IOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE"
210+
- make smoke-test-tvos-all OS="$DEFAULT_TVOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE"
210211

211212
SPM Build (Swift 5.10):
212213
stage: smoke-test

IntegrationTests/IntegrationScenarios/Scenarios/RUM/RUMTapActionScenarioTests.swift

+6-19
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,12 @@ private extension ExampleApplication {
3232
buttons["Show various UIControls"].tap()
3333
}
3434

35-
func tapTextField() {
36-
tables.cells
35+
func tapTextField(_ text: String) {
36+
let textField = tables.cells
3737
.containing(.staticText, identifier: "UITextField")
3838
.children(matching: .textField).element
39-
.tap()
40-
}
41-
42-
func enterTextUsingKeyboard(_ text: String) {
43-
// NOTE: RUMM-740 iOS 13 Swipe typing feature presents its onboarding
44-
// That blocks the keyboard with a Continue button
45-
// it must be tapped first to get the real keyboard
46-
let swipeTypingContinueButton = buttons["Continue"]
47-
if swipeTypingContinueButton.exists {
48-
swipeTypingContinueButton.tap()
49-
}
50-
text.forEach { letter in
51-
keys[String(letter)].tap()
52-
}
39+
textField.tap()
40+
textField.typeText(text)
5341
}
5442

5543
func dismissKeyboard() {
@@ -63,7 +51,7 @@ private extension ExampleApplication {
6351
}
6452

6553
func moveSlider(to position: CGFloat) {
66-
tables.sliders["50%"].adjust(toNormalizedSliderPosition: position)
54+
tables.sliders.firstMatch.adjust(toNormalizedSliderPosition: position)
6755
}
6856

6957
func tapSegmentedControlSegment(label: String) {
@@ -96,8 +84,7 @@ class RUMTapActionScenarioTests: IntegrationTests, RUMCommonAsserts {
9684
app.tapShowUICollectionView()
9785
app.tapCollectionViewItem(atIndex: 14)
9886
app.tapShowVariousUIControls()
99-
app.tapTextField()
100-
app.enterTextUsingKeyboard("foo")
87+
app.tapTextField("foo")
10188
app.dismissKeyboard()
10289
app.tapStepperPlusButton()
10390
app.moveSlider(to: 0.25)

0 commit comments

Comments
 (0)