Skip to content

Use Xcode 26.6 and Ruby 3.4.9 #25748

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.

Sign up for GitHub

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
mokagio merged 11 commits into from
Jul 7, 2026
Merged

Use Xcode 26.6 and Ruby 3.4.9 #25748

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
636c572
Require Xcode 26.6 in CI
mokagio Jul 6, 2026
62afedf
Use Ruby 3.4.9 and re-bundle with latest Bundler, 4.0.15
mokagio Jul 6, 2026
570a469
Trust FelixHerrmann tap for newer Homebrew
mokagio Jul 6, 2026
281e8b0
Drop dead BUNDLE_SPECIFIC_PLATFORM bundler setting
mokagio Jul 6, 2026
f9e72e1
Remove verbose AI comment
mokagio Jul 6, 2026
05032c0
Extract swift-package-list install to shared script
mokagio Jul 6, 2026
edebc80
Disable Homebrew ask-mode to unblock CI installs
mokagio Jul 6, 2026
9c180e3
Merge branch 'trunk' into ainfra-2600-use-ruby-349-in-wordpress-ios
mokagio Jul 7, 2026
574dd2e
Move one CI log header print to the script the log is about
mokagio Jul 7, 2026
a3b8524
Double quote to avoid word splitting in `build-for-testing.sh`
mokagio Jul 7, 2026
c3a0048
Only run `brew trust` where available
mokagio Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .buildkite/commands/build-for-testing.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ if [[ "$APP" != "wordpress" && "$APP" != "jetpack" ]]; then
fi

echo "--- :beer: Installing Homebrew Dependencies"
brew tap FelixHerrmann/tap
brew install swift-package-list
"$(dirname "${BASH_SOURCE[0]}")/install-swift-package-list.sh"

"$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh"

Expand Down
5 changes: 5 additions & 0 deletions .buildkite/commands/install-swift-package-list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash -eu

Comment on lines +1 to +2

@mokagio mokagio Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the same myself when looking at the diff, but CI being green disproved this...

brew tap FelixHerrmann/tap
brew trust FelixHerrmann/tap
brew install swift-package-list
Comment thread
Copilot marked this conversation as resolved.
6 changes: 4 additions & 2 deletions .buildkite/commands/shared-set-up-distribution.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/bin/bash -eu

# Homebrew 6 ask-mode prompts before installing dependencies and hangs on the CI PTY.
export HOMEBREW_NO_ASK=1

echo "--- :beer: Installing Homebrew Dependencies"
# Sentry CLI needs to be up-to-date
brew upgrade sentry-cli

brew tap FelixHerrmann/tap
brew install swift-package-list
"$(dirname "${BASH_SOURCE[0]}")/install-swift-package-list.sh"

brew install imagemagick
brew install ghostscript
2 changes: 1 addition & 1 deletion .bundle/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ BUNDLE_PATH: "vendor/bundle"
BUNDLE_JOBS: "3"
BUNDLE_WITHOUT: "screenshots"
BUNDLE_RETRY: "3"
BUNDLE_SPECIFIC_PLATFORM: "false"

@mokagio mokagio Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This config is no longer used by Bundler

BUNDLE_FORCE_RUBY_PLATFORM: "true"
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.4.9
2 changes: 1 addition & 1 deletion .xcode-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26.4.1
26.6
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,4 +399,4 @@ DEPENDENCIES
rubocop-rake (~> 0.7)

BUNDLED WITH
2.4.22
4.0.15