Skip to content

Commit 9c9599c

Browse files
authored
Upgrade to Xcode 16.3 and 18.4 toolchain (#15608)
2 parents d9d98ed + c965cd6 commit 9c9599c

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.buildkite/shared-pipeline-vars

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
XCODE_VERSION=$(sed 's/^~> *//' .xcode-version)
77
CI_TOOLKIT_PLUGIN_VERSION="4.0.0"
88

9-
# Note: `-v4` suffix was added to use xcode-16.1-v4 image; remember to remove that suffix during the next Xcode update
10-
export IMAGE_ID="xcode-$XCODE_VERSION-v4"
9+
# FIXME: The -v2 suffix is required only as long as we use the 16.3 image.
10+
# This if check is here just so that we won't break the build if we forget about the suffix when it comes upgrade time.
11+
# But if you are reading this and 16.3 is no longer in use, please remove the check and the suffix.
12+
if [ "$XCODE_VERSION" = "16.3" ]; then
13+
export IMAGE_ID="xcode-$XCODE_VERSION-v2"
14+
else
15+
export IMAGE_ID="xcode-$XCODE_VERSION"
16+
fi
1117
export CI_TOOLKIT="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"

.xcode-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
~> 16.1
1+
~> 16.3

Yosemite/YosemiteTests/Stores/ReceiptStoreTests.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,10 @@ final class ReceiptStoreTests: XCTestCase {
415415
}
416416

417417
func test_generateContent_callsGenerate_passingUnmodified_customerNote() throws {
418+
if #available(iOS 18.4, *) {
419+
throw XCTSkip("Skipped on iOS 18.4 because of a WebKit crash when running on that OS.")
420+
}
421+
418422
// Given
419423
let mockIntent = PaymentIntent.fake().copy(charges: [Mocks.cardPresentCharge])
420424
let mockParameters = try XCTUnwrap(mockIntent.receiptParameters())

0 commit comments

Comments
 (0)