Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.

jrflat and others added 9 commits May 19, 2025 14:29
* Add test case to reproduce JSON bug

* Increment encoding limit by 1 to match decoding behavior

* Move checking condition & add expect fail test

* Skip failing test on windows
* Locale.preferredLocales

Initial proposal

* Update Proposals/0026-preferredLocales.md

Fix link

Co-authored-by: Tina L <49205802+itingliu@users.noreply.github.com>

---------

Co-authored-by: Tina L <49205802+itingliu@users.noreply.github.com>
Co-authored-by: Karan Miśra <karan_misra@apple.com>
@jmschonfeld
Copy link
Contributor

@swift-ci please test

@jmschonfeld jmschonfeld marked this pull request as ready for review May 27, 2025 16:49
@jmschonfeld jmschonfeld requested review from itingliu and parkera May 27, 2025 16:49
@parkera parkera merged commit 3df3260 into release/6.2 May 27, 2025
4 checks passed
@parkera parkera deleted the automerge/merge-main-2025-05-26_09-13 branch May 27, 2025 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants