[CP-beta]Fix killing wrong xcrun command by flutteractionsbot · Pull Request #185097 · flutter/flutter

flutteractionsbot · 2026-04-15T19:10:28Z

This pull request is created by automatic cherry pick workflow
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.

Issue Link:

What is the link to the issue this cherry-pick is addressing?

#184754

Impact Description:

What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)?
Does it impact development (ex. flutter doctor crashes when Android Studio is installed),
or the shipping of production apps (the app crashes on launch).
This information is for domain experts and release engineers to understand the consequences of saying yes or no to the cherry pick.

Mac flavors_test_macos test may not pass in CI.

Changelog Description:

Explain this cherry pick:

In one line that is accessible to most Flutter developers.
That describes the state prior to the fix.
That includes which platforms are impacted.
See best practices for examples.

< Replace with changelog description here >
[flutter/184754] When building using SwiftPM for iOS or macOS apps, the build may fail due to xcrun error.

Workaround:

Is there a workaround for this issue?

Disable SwiftPM

Risk:

What is the risk level of this cherry-pick?

Low
Medium
High

Test Coverage:

Are you confident that your fix is well-tested by automated tests?

Yes
No

Validation Steps:

What are the steps to validate that this fix works?

Run Mac flavors_test_macos in CI.

We use `pgrep` to kill any matching existing `xcrun xcodebuild -resolvePackageDependencies` command. However, we did not specify that it should match on arguments and therefore was only matching on process name, killing other xcrun` commands. Fixes flutter#184754. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.  [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

flutteractionsbot · 2026-04-15T19:10:30Z

@vashworth please fill out the PR description above, afterwards the release team will review this request.

flutter-dashboard · 2026-04-15T19:10:31Z

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

gemini-code-assist

Code Review

This pull request updates the pgrep command in xcodeproj.dart to include the -f flag for matching full argument lists and adjusts the corresponding test expectations. Feedback indicates that on macOS, passing multiple arguments to pgrep results in an 'OR' match, which could lead to matching and killing unrelated processes. It is recommended to join the command arguments into a single pattern string and update all test mocks accordingly.

gemini-code-assist · 2026-04-15T19:12:28Z

+        final RunResult result = await _processUtils.run([
+          'pgrep',
+          '-n', // Select only the newest
+          '-f', // Match against full argument lists
+          ...command,
+        ]);


On macOS, pgrep treats multiple arguments as separate patterns and performs an OR match between them. Since the command list starts with common strings like xcrun and xcodebuild, passing them as separate arguments with the -f flag will match any process on the system that contains any of those strings in its command line. This is likely to match unrelated processes (e.g., another concurrent Xcode build) and kill the wrong one.\n\nTo ensure that only the specific process with the exact set of arguments is matched, the command components should be joined into a single pattern.

Suggested change

final RunResult result = await _processUtils.run([

'pgrep',

'-n', // Select only the newest

'-f', // Match against full argument lists

...command,

]);

final RunResult result = await _processUtils.run([\n 'pgrep',\n '-n', // Select only the newest\n '-f', // Match against full argument lists\n command.join(' '),\n ]);

gemini-code-assist · 2026-04-15T19:12:28Z


  const kFindProcessResolvePackagesCommand = FakeCommand(
-    command: <String>['pgrep', '-n', ...kResolvePackagesCommandList],
+    command: <String>['pgrep', '-n', '-f', ...kResolvePackagesCommandList],


This test expectation needs to be updated to match the suggested change in xcodeproj.dart, where the command arguments are joined into a single pattern for pgrep -f.

Suggested change

command: <String>['pgrep', '-n', '-f', ...kResolvePackagesCommandList],

command: <String>['pgrep', '-n', '-f', kResolvePackagesCommandList.join(' ')],

gemini-code-assist · 2026-04-15T19:12:28Z

          command: <String>[
            'pgrep',
            '-n',
+            '-f',
            'xcrun',
            'xcodebuild',
            '-clonedSourcePackagesDirPath',


Similar to the previous comment, all pgrep mock commands in this test file should be updated to use a single joined string for the pattern when using the -f flag, to match the corrected implementation in xcodeproj.dart.

…75cd6052e2b53c5960d2d6c7

asaarnak · 2026-04-21T12:26:33Z

My Codemagic build on flutter 3.44.0-1.0.pre-169 (both beta and main) get this error.
Seems to be related to this issue.
Because when using ssh session and running manually the command sh -c '/Applications/Xcode-26.4.app/Contents/Developer/usr/bin/xcodebuild -sdk /Applications/Xcode-26.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS26.4.sdk -find clang 2> /dev/null' works and returns correct path but fails right after building. No issues on flutter stable.

Running pod install...                                             52.9s
Running Xcode build...                                          
Xcode archive done.                                         74.5s
Failed to build iOS app
Error (Xcode): sh -c '/Applications/Xcode-26.4.app/Contents/Developer/usr/bin/xcodebuild -sdk /Applications/Xcode-26.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS26.4.sdk -find clang 2> /dev/null' failed with exit code 36608: (null) (errno=No such file or directory)
/Users/builder/clone/ios/xcrun:0:0

Error (Xcode): unable to find utility "clang", not a developer tool or in PATH
/Users/builder/clone/ios/xcrun:0:0

Encountered error while archiving for device.


Build failed :|
Failed to build for iOS

asaarnak · 2026-04-21T14:06:39Z

Tested that by removing this it started working on Codemagic: asaarnak@3df4bdc

asaarnak · 2026-05-08T08:43:15Z

Tested that this #185831 fixes this error for us.

flutteractionsbot added the cp: review Cherry-picks in the review queue label Apr 15, 2026

flutteractionsbot requested a review from a team as a code owner April 15, 2026 19:10

github-actions Bot added platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. team-ios Owned by iOS platform team labels Apr 15, 2026

eyebrowsoffire added the CICD Run CI/CD label Apr 15, 2026

gemini-code-assist Bot reviewed Apr 15, 2026

View reviewed changes

vashworth approved these changes Apr 15, 2026

View reviewed changes

Merge branch 'flutter-3.44-candidate.0' into cp-beta-f5f845703df0aa3d…

4fc95ae

…75cd6052e2b53c5960d2d6c7

github-actions Bot removed the CICD Run CI/CD label Apr 15, 2026

eyebrowsoffire added the CICD Run CI/CD label Apr 15, 2026

eyebrowsoffire approved these changes Apr 15, 2026

View reviewed changes

eyebrowsoffire added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 15, 2026

auto-submit Bot merged commit dbd49b7 into flutter:flutter-3.44-candidate.0 Apr 15, 2026
152 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[CP-beta]Fix killing wrong xcrun command#185097

[CP-beta]Fix killing wrong xcrun command#185097
auto-submit[bot] merged 2 commits into
flutter:flutter-3.44-candidate.0from
flutteractionsbot:cp-beta-f5f845703df0aa3d75cd6052e2b53c5960d2d6c7

flutteractionsbot commented Apr 15, 2026 •

edited by vashworth

Loading

Uh oh!

flutteractionsbot commented Apr 15, 2026

Uh oh!

flutter-dashboard Bot commented Apr 15, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Apr 15, 2026

Uh oh!

gemini-code-assist Bot Apr 15, 2026

Uh oh!

gemini-code-assist Bot Apr 15, 2026

Uh oh!

Uh oh!

asaarnak commented Apr 21, 2026

Uh oh!

asaarnak commented Apr 21, 2026

Uh oh!

asaarnak commented May 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	command: <String>['pgrep', '-n', '-f', ...kResolvePackagesCommandList],
	command: <String>['pgrep', '-n', '-f', kResolvePackagesCommandList.join(' ')],

Uh oh!

Conversation

flutteractionsbot commented Apr 15, 2026 • edited by vashworth Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue Link:

Impact Description:

Changelog Description:

Workaround:

Risk:

Test Coverage:

Validation Steps:

Uh oh!

flutteractionsbot commented Apr 15, 2026

Uh oh!

flutter-dashboard Bot commented Apr 15, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

asaarnak commented Apr 21, 2026

Uh oh!

asaarnak commented Apr 21, 2026

Uh oh!

asaarnak commented May 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

flutteractionsbot commented Apr 15, 2026 •

edited by vashworth

Loading