Skip to content

Commit 4cfb596

Browse files
authored
Merge branch 'v8.x' into itay/fix_replay_integration
2 parents 10c151e + 41834f1 commit 4cfb596

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ jobs:
243243
- name: iOS 26 Sentry
244244
runs-on: macos-26
245245
platform: "iOS"
246-
xcode: "26.0.1"
247-
test-destination-os: "26.0"
246+
xcode: "26.1"
247+
test-destination-os: "26.1"
248248
device: "iPhone 17 Pro"
249249
scheme: "Sentry"
250250

@@ -272,8 +272,8 @@ jobs:
272272
- name: macOS 26 Sentry
273273
runs-on: macos-26
274274
platform: "macOS"
275-
xcode: "26.0.1"
276-
test-destination-os: "26.0"
275+
xcode: "26.1"
276+
test-destination-os: "26.1"
277277
scheme: "Sentry"
278278

279279
# Catalyst. We test the latest version, as the risk something breaking on Catalyst and not
@@ -328,8 +328,8 @@ jobs:
328328
- name: tvOS 26 Sentry
329329
runs-on: macos-26
330330
platform: "tvOS"
331-
xcode: "26.0.1"
332-
test-destination-os: "26.0"
331+
xcode: "26.1"
332+
test-destination-os: "26.1"
333333
device: "Apple TV"
334334
scheme: "Sentry"
335335

.github/workflows/ui-tests-common.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ jobs:
7979
env:
8080
XCODE_VERSION: ${{ inputs.xcode_version }}
8181
- name: Install required platforms for Xcode 26
82-
if: ${{ inputs.xcode_version == '26.0.1' }}
82+
if: ${{ inputs.xcode_version == '26.1' }}
8383
run: ./scripts/ci-install-xOS-26-platforms.sh --platforms "${{inputs.platform}}"
8484

8585
- name: Create simulator device for Xcode 26
86-
if: ${{ inputs.xcode_version == '26.0.1' }}
86+
if: ${{ inputs.xcode_version == '26.1' }}
8787
run: ./scripts/ci-create-simulator.sh --platform "${{inputs.platform}}" --os-version "${{inputs.test-destination-os}}" --device-name "${{inputs.device}}"
8888
- run: make init-ci-build
8989
if: ${{ inputs.build_with_make }}

.github/workflows/ui-tests-critical.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ jobs:
7676
- name: iOS 26
7777
platform:
7878
runs-on: macos-15
79-
xcode: "26.0.1"
79+
xcode: "26.1"
8080
platform: "iOS"
8181
device: "iPhone 16 Pro"
82-
test-destination-os: "26.0"
82+
test-destination-os: "26.1"
8383

8484
secrets:
8585
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ui-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ jobs:
9898
- name: iOS 26
9999
runs-on: macos-15
100100
platform: "iOS"
101-
xcode: "26.0.1"
101+
xcode: "26.1"
102102
device: iPhone 16 Pro
103-
test-destination-os: "26.0"
103+
test-destination-os: "26.1"
104104
with:
105105
fastlane_command: ui_tests_ios_swift
106106
files_suffix: _xcode_${{matrix.xcode}}-${{matrix.device}}

scripts/ci-create-simulator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1111
source "${SCRIPT_DIR}/ci-utils.sh"
1212

1313
# Usage: ./scripts/ci-create-simulator.sh --platform <platform> --os-version <os_version> --device-name <device_name>
14-
# Example: ./scripts/ci-create-simulator.sh --platform iOS --os-version 26.0 --device-name "iPhone 16e"
14+
# Example: ./scripts/ci-create-simulator.sh --platform iOS --os-version 26.1 --device-name "iPhone 16e"
1515

1616
PLATFORM=""
1717
OS_VERSION=""
1818
DEVICE_NAME=""
1919

2020
usage() {
2121
log_error "Usage: $0 --platform <platform> --os-version <os_version> --device-name <device_name>"
22-
log_error " Example: $0 --platform iOS --os-version 26.0 --device-name \"iPhone 16e\""
22+
log_error " Example: $0 --platform iOS --os-version 26.1 --device-name \"iPhone 16e\""
2323
exit 1
2424
}
2525

scripts/ci-install-xOS-26-platforms.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,28 @@ IFS=',' read -ra PLATFORM_ARRAY <<< "$PLATFORMS"
4848
for platform in "${PLATFORM_ARRAY[@]}"; do
4949
case "$platform" in
5050
"iOS")
51-
begin_group "Installing iOS 26.0 simulator"
51+
begin_group "Installing iOS 26.1 simulator"
5252
xcodebuild -downloadPlatform iOS -quiet || {
5353
log_warning "Failed to download iOS platform, continuing..."
5454
}
5555
end_group
5656
;;
5757
"tvOS")
58-
begin_group "Installing tvOS 26.0 simulator"
58+
begin_group "Installing tvOS 26.1 simulator"
5959
xcodebuild -downloadPlatform tvOS -quiet || {
6060
log_warning "Failed to download tvOS platform, continuing..."
6161
}
6262
end_group
6363
;;
6464
"visionOS")
65-
begin_group "Installing visionOS 26.0 simulator"
65+
begin_group "Installing visionOS 26.1 simulator"
6666
xcodebuild -downloadPlatform visionOS -quiet || {
6767
log_warning "Failed to download visionOS platform, continuing..."
6868
}
6969
end_group
7070
;;
7171
"watchOS")
72-
begin_group "Installing watchOS 26.0 simulator"
72+
begin_group "Installing watchOS 26.1 simulator"
7373
xcodebuild -downloadPlatform watchOS -quiet || {
7474
log_warning "Failed to download watchOS platform, continuing..."
7575
}

0 commit comments

Comments
 (0)