Skip to content

Merge release/6.4.x into main - #1791

Merged
mhrawdon merged 25 commits into
mainfrom
automerge/merge-main-2026-09-25_17-17
Sep 25, 2026
Merged

mhrawdon merged 25 commits into
mainfrom
automerge/merge-main-2026-09-25_17-17

Conversation

@github-actions

Copy link
Copy Markdown

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.

owenv and others added 25 commits September 21, 2026 10:10
[6.4.x] Use generic unix domain as base for bare metal linker spec
[6.4.x] Ensure we derive correct autolink entries for Foundation when statically linking the stdlib
[6.4.2] Ensure we derive correct autolink entries for Foundation when statically linking the stdlib
The arm64 CI hosts do not currently have Metal toolchain installed. Skip `singleFileCompileMetal` and `incrementalMetalLinkWithCodeSign` on arm64 hosts to unblock CI, alongside the existing skip for GitHub runners.
…ame-override to appintentsmetadataprocessor

- Remove the options flags, and the Xcode build settings that govern them, from .xcspec files.
- Update unit tests to exclude `--validate-assistant-intents` from expected arguments.
- Delete `AppIntentsMetadataTaskConstructionTests.disableAssistantIntentsProviderValidation()`.

rdar://177561318
The test asserted that a watchOS device run destination resolves ARCHS to
`arm64_32`. Since the arm64_32 architecture spec in watchOSDevice.xcspec gained
`DeploymentTargetRange = ( "0", "27" )`,
`Settings.addStandardArchitecturesOverride` constrains arm64_32 out of
ARCHS_STANDARD at watchOS deployment targets of 27 or later, leaving its
compatibility architecture `arm64`.

Derive the expected architecture from the watchOS SDK's default deployment
target so the test asserts the exact value on either side of that cutoff,
rather than gating the expectation on the Xcode version and skipping a variant.
…en, to work both before/after the diagnostic string was changed.

Resolves rdar://177031942.
[6.4.1] Test compatibility updates
Ensure we derive correct autolink entries for Foundation when statica…
tapi installapi emits no .d when it parses zero headers e.g. an umbrella
whose only header is excluded with -exclude-public-header. However, the .d
was declared as a makefile dependency, so llbuild fails to open the
missing file and the build errors.
…24_00-05

Merge `release/6.4.1` into `release/6.4.2`
…d-deps

Revert InstallAPI discovered dependency file

rdar://188019988
…24_17-06

Merge `release/6.4.2` into `release/6.4.x`
…24_21-15

Merge `release/6.4.2` into `release/6.4.x`
@mhrawdon

Copy link
Copy Markdown
Contributor

@swift-ci test

@mhrawdon
mhrawdon marked this pull request as ready for review September 25, 2026 20:20
@mhrawdon
mhrawdon merged commit 4df9fdd into main Sep 25, 2026
91 of 123 checks passed
@mhrawdon
mhrawdon deleted the automerge/merge-main-2026-09-25_17-17 branch September 25, 2026 21:31
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