Skip to content

[CP-stable] Upgrade iOS version#188457

Merged
auto-submit[bot] merged 2 commits into
flutter:flutter-3.44-candidate.0from
okorohelijah:cherry-pick-186889-to-stable
Jun 24, 2026
Merged

[CP-stable] Upgrade iOS version#188457
auto-submit[bot] merged 2 commits into
flutter:flutter-3.44-candidate.0from
okorohelijah:cherry-pick-186889-to-stable

Conversation

@okorohelijah

@okorohelijah okorohelijah commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

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?

#186090

Impact Description:

Updating CI to use either iOS 18 or 26 for easy transition when we update our devicelab bots

< Replace with impact description here >

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/<ISSUE_NUMBER>] When [on <PLAFORMS(S)>],

Workaround:

Is there a workaround for this issue?

n/a

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?

< Replace with validation steps here >

@okorohelijah okorohelijah added the cp: stable cherry pick this pull request to stable release candidate branch label Jun 23, 2026
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 23, 2026
@flutter-dashboard

Copy link
Copy Markdown

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.

@flutter-dashboard

Copy link
Copy Markdown

This pull request is not mergeable in its current state, likely because of a merge conflict. Pre-submit CI jobs were not triggered. Pushing a new commit to this branch that resolves the issue will result in pre-submit jobs being scheduled.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request updates the .ci.yaml configuration file to include iOS-26 in the device_os property and restricts the os property to Mac-15.7 across multiple test targets. The reviewer identified that iOS-26 is likely a non-existent version and suggested correcting it to a valid version like iOS-16 or iOS-17 to prevent CI/CD platform property matching failures.

Comment thread .ci.yaml
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
device_os: iOS-18
os: Mac-15.7
device_os: iOS-18|iOS-26

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

The iOS version iOS-26 does not exist and is likely a typo for iOS-16 (or potentially iOS-17). Using a non-existent OS version will cause CI/CD platform property matching to fail.

      device_os: iOS-18|iOS-16

Comment thread .ci.yaml
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
cpu: x86
device_os: iOS-18
device_os: iOS-18|iOS-26

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

The iOS version iOS-26 does not exist and is likely a typo for iOS-16 (or potentially iOS-17). Using a non-existent OS version will cause CI/CD platform property matching to fail.

      device_os: iOS-18|iOS-16

Comment thread .ci.yaml
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
cpu: arm64
device_os: iOS-18
device_os: iOS-18|iOS-26

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

The iOS version iOS-26 does not exist and is likely a typo for iOS-16 (or potentially iOS-17). Using a non-existent OS version will cause CI/CD platform property matching to fail.

      device_os: iOS-18|iOS-16

Comment thread .ci.yaml
task_name: flutter_gallery__transition_perf_e2e_ios
drone_dimensions: >
["device_os=iOS-18","os=Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7", "cpu=x86"]
["device_os=iOS-18|iOS-26","os=Mac-15.7", "cpu=x86"]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

The iOS version iOS-26 does not exist and is likely a typo for iOS-16 (or potentially iOS-17). Using a non-existent OS version will cause CI/CD platform property matching to fail.

        ["device_os=iOS-18|iOS-16","os=Mac-15.7", "cpu=x86"]

Upgrade iOS version to use either iOS 18 or 26

*List which issues are fixed by this PR. You must list at least one
issue. An issue is not required if the PR fixes something trivial like a
typo.*

Fixes flutter#186090

*If you had to change anything in the [flutter/tests] repo, include a
link to the migration guide as per the [breaking change policy].*

- [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.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [ ] 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.

<!-- Links -->
[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
@okorohelijah
okorohelijah force-pushed the cherry-pick-186889-to-stable branch from 5d0e3a6 to 55ccc98 Compare June 23, 2026 21:55
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 23, 2026
@okorohelijah okorohelijah changed the title [stable] Upgrade iOS version [CP-stable] Upgrade iOS version Jun 23, 2026
@okorohelijah
okorohelijah requested a review from vashworth June 23, 2026 21:58
vashworth
vashworth previously approved these changes Jun 23, 2026
@okorohelijah okorohelijah added cp: review Cherry-picks in the review queue autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD labels Jun 23, 2026
@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 23, 2026
@auto-submit

auto-submit Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

autosubmit label was removed for flutter/flutter/188457, because - The status or check suite Mac_arm64 build_tests_2_5 has failed. Please fix the issues identified (or deflake) before re-applying this label.

@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 24, 2026
@okorohelijah okorohelijah added the CICD Run CI/CD label Jun 24, 2026
@okorohelijah
okorohelijah force-pushed the cherry-pick-186889-to-stable branch from 749881a to ec61884 Compare June 24, 2026 06:27
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 24, 2026
@okorohelijah okorohelijah added CICD Run CI/CD autosubmit Merge PR when tree becomes green via auto submit App and removed autosubmit Merge PR when tree becomes green via auto submit App labels Jun 24, 2026
@okorohelijah
okorohelijah requested a review from vashworth June 24, 2026 07:05
@okorohelijah okorohelijah added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 24, 2026
@auto-submit
auto-submit Bot merged commit db3d82a into flutter:flutter-3.44-candidate.0 Jun 24, 2026
154 checks passed
auto-submit Bot pushed a commit that referenced this pull request Jun 24, 2026
Updates the changelog for 3.44.4 stable hotfix.

Includes #188460

Excluded #188457 because it's an internal CI change
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD cp: review Cherry-picks in the review queue cp: stable cherry pick this pull request to stable release candidate branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants