-
Notifications
You must be signed in to change notification settings - Fork 160
CI: Use Xcode 26.2 for building and testing Glean #3350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking "Sign up for GitHub", you agree to our terms of service and privacy statement. We'll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
CI: Use Xcode 26.2 for building and testing Glean #3350
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -516,7 +516,7 @@ jobs: | |
|
|
||
| Check Swift formatting: | ||
| macos: | ||
| xcode: "16.4" | ||
| xcode: "26.2" | ||
| resource_class: "m4pro.medium" | ||
| steps: | ||
| - checkout | ||
|
|
@@ -534,7 +534,7 @@ jobs: | |
|
|
||
| iOS build and test: | ||
| macos: | ||
| xcode: "16.4" | ||
| xcode: "26.2" | ||
| resource_class: "m4pro.medium" | ||
| steps: | ||
| - checkout | ||
|
|
@@ -548,16 +548,16 @@ jobs: | |
| - setup-rust-toolchain | ||
| - restore_cache: | ||
| name: Restore rubygems cache | ||
| key: swift-docs-gems-v22 | ||
| key: swift-docs-gems-v23 | ||
| - run: | ||
| name: Install jazzy | ||
| command: gem install --no-document jazzy | ||
| - save_cache: | ||
| name: Save rubygems cache | ||
| # NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED | ||
| key: swift-docs-gems-v22 | ||
| key: swift-docs-gems-v23 | ||
| paths: | ||
| - ~/.rbenv/versions/3.4.3/lib/ruby/gems/3.4.0 | ||
| - ~/.rbenv/versions/3.4.7/lib/ruby/gems/3.4.0 | ||
| - run: | ||
| name: Setup build environment | ||
| command: | | ||
|
|
@@ -573,7 +573,7 @@ jobs: | |
| DEVICES=$(xcrun xctrace list devices 2>&1) | ||
| echo "$DEVICES" | ||
| # Pick a device and start it | ||
| UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18' | awk -F'[()]' '{print $4}') | ||
| UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 17 Simulator (26' | awk -F'[()]' '{print $4}') | ||
| xcrun simctl boot "$UUID" | ||
| # Store build type for use in cache key | ||
| if [ -z "${CIRCLE_TAG}" ]; then | ||
|
|
@@ -635,7 +635,7 @@ jobs: | |
|
|
||
| iOS integration test: | ||
| macos: | ||
| xcode: "16.4" | ||
| xcode: "26.2" | ||
| resource_class: "m4pro.medium" | ||
| steps: | ||
| - checkout | ||
|
|
@@ -657,7 +657,7 @@ jobs: | |
| DEVICES=$(xcrun xctrace list devices 2>&1) | ||
| echo "$DEVICES" | ||
| # Pick a device and start it | ||
| UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 16 Simulator (18' | awk -F'[()]' '{print $4}') | ||
| UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 17 Simulator (26' | awk -F'[()]' '{print $4}') | ||
| xcrun simctl boot "$UUID" | ||
| - run: | ||
| name: Build XCFramework archive | ||
|
|
@@ -680,7 +680,7 @@ jobs: | |
|
|
||
| iOS Framework release: | ||
| macos: | ||
| xcode: "16.4" | ||
| xcode: "26.2" | ||
| resource_class: "m4pro.medium" | ||
| steps: | ||
| - checkout | ||
|
|
@@ -923,7 +923,7 @@ jobs: | |
|
|
||
| pypi-macos-release: | ||
| macos: | ||
| xcode: "16.4" | ||
| xcode: "26.2" | ||
| resource_class: "m4pro.medium" | ||
| steps: | ||
| - install-rustup | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ | |
| * Tiny performance improvement for putting tasks on the dispatcher ([#3318](https://github.com/mozilla/glean/pull/3318)) | ||
| * Instrument the case when the `client_id.txt` file does not exist yet ([#3339](https://github.com/mozilla/glean/pull/3339)) | ||
| * When a missing client ID in the database is detected, Glean now restores the backup client ID ([#3334](https://github.com/mozilla/glean/pull/3334)) | ||
| * iOS | ||
| * Glean for iOS is now being built with Xcode 26.2 ([#3350](https://github.com/mozilla/glean/pull/3350)) | ||
|
|
||
| # v66.1.2 (2025-11-25) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ xcodebuild \ | |
| -workspace ./glean-core/ios/Glean.xcodeproj/project.xcworkspace \ | ||
| -scheme Glean \ | ||
| -sdk iphonesimulator \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 16' \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 17' \ | ||
| build | \ | ||
| tee raw_xcodebuild.log | \ | ||
| xcpretty && exit "${PIPESTATUS[0]}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ xcodebuild \ | |
| -workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworks pace \ | ||
| -scheme glean-sample-app \ | ||
| -sdk iphonesimulator \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 16' \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 17' \ | ||
| build | \ | ||
| tee raw_sample_xcodebuild.log | \ | ||
| xcpretty && exit "${PIPESTATUS[0]}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ xcodebuild \ | |
| -workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworks pace \ | ||
| -scheme glean-sample-app \ | ||
| -sdk iphonesimulator \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 16' \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 17' \ | ||
| test | \ | ||
| tee raw_sample_xcodetest.log | \ | ||
| xcpretty && exit "${PIPESTATUS[0]}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ xcodebuild \ | |
| -workspace ./glean-core/ios/Glean.xcodeproj/project.xcworkspace \ | ||
| -scheme Glean \ | ||
| -sdk iphonesimulator \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 16' \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 17' \ | ||
| test | \ | ||
| tee raw_xcodetest.log | \ | ||
| xcpretty && exit "${PIPESTATUS[0]}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| ## Prepare your build environment | ||
|
|
||
| 1. Install Xcode 16.4 or higher. | ||
| 1. Install Xcode 26.2 or higher. | ||
| 2. Ensure you have Python 3 installed: `brew install python` | ||
| 3. Install linting and formatting tools: `brew install swiftlint` | ||
| 4. (Optional, only required for building on the CLI) Install [xcpretty](https://github.com/xcpretty/xcpretty): `gem install xcpretty` | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ Glean sends a [`baseline`][] ping when the app is sent to background. | |
|
|
||
| ## Build | ||
|
|
||
| 1. Install Xcode 16.4 or higher. | ||
| 1. Install Xcode 26.2 or higher. | ||
|
|
||
| 2. Install the latest [Xcode developer tools](https://developer.apple.com/xcode/downloads/) from Apple. | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.