Skip to content

Merge main into release/6.2 #1361

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 14 commits into from
Jun 17, 2025

Conversation

github-actions[bot]
Copy link

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.

jmschonfeld and others added 13 commits June 9, 2025 11:35
* Revert "Revert "Add tests for AttributedString Index Tracking preconditions (#1326)" (#1337)"

This reverts commit 2df5199.

* Disable exit tests on Ubuntu 20.04 for now
* Convert CoW tests to swift-testing

* Convert discontiguous tests to swift-testing

* Convert index validity tests to swift-testing

* Convert constraining behavior tests to swift-testing

* Convert base attributed string tests to swift-testing

* Fix build failure

* Fix test crash
* Add a proposal for the definition of a UTCClock

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

* Update Proposals/NNNN-UTCClock.md

Co-authored-by: Tina L <[email protected]>

---------

Co-authored-by: Tina L <[email protected]>
`time_t` is defined as `Int64` in wasi-libc, not `Int`.
* Add a proposal for category support in Locale.Region

* Add Locale.Region.Category.grouping

* Update 'grouping' discussion

* Update var category type. Conform Category to CustomDebugStringConvertible

* Update implementation link

* Rename NNNN-locale-region-category.md to 0028-locale-region-category.md

* Apply review manager's suggestion
* Enable macOS GitHub Action CI

* Add explicit macOS version list
Use proper overflow add function.

Resolves 144178080
* Convert buffer view tests to swift-testing

* Convert BuiltInUnicodeScalarSet tests

* Convert ErrorTests

* Convert LockedStateTests

* Move aside old XCTest-based equatable/hashable utilities and define new swift-testing utilities

* Convert UUID tests

* Convert DateInterval tests

* Convert date tests

* Convert SortComparator tests

* Convert decimal tests

* Convert IndexPath tests

* Fix build failures
* Convert FileManager and URL tests to swift-testing

* Fix Linux/Windows build failures

* Fix Windows build failures

* Remove URL prefix from other test functions

* Fix Windows build failures
@jmschonfeld
Copy link
Contributor

@swift-ci please test

@jmschonfeld
Copy link
Contributor

@swift-ci please test

@jmschonfeld jmschonfeld marked this pull request as ready for review June 16, 2025 17:32
@jmschonfeld jmschonfeld merged commit 5846901 into release/6.2 Jun 17, 2025
15 checks passed
@jmschonfeld jmschonfeld deleted the automerge/merge-main-2025-06-16_09-01 branch June 17, 2025 22:01
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.

4 participants