Merge release/6.2 into main
#684
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This hang occurred only in CI environments and only on Linux. Here's the sequence of events: - Test terminates swbuild using SIGKILL - OS reparents SWBBuildService (a subprocess of swbuild) to launchd (Darwin) / init (others) - OS closes the file descriptors for the I/O pipes swbuild has connected to SWBBuildService - SWBBuildService's read() loop indicates EOF due to the broken pipe - SWBBuildService causes itself to exit At this point, the getpgid loop should return ERSCH and terminate the test. However, SWBBuildService is sticking around as a zombie for an extended period of time without init reaping the pid, causing getpgid to never hit the termination state. This causes the test to hang indefinitely. To fix this, there are two aspects: - A timeout is added around the termination monitoring loop that forces the exit promise to be fulfilled with an error if a 30-second interval elapses without the process exiting - We switch from using a getpgid loop to using a waitid loop, where the terminal state is that the process has _exited_... we don't care if the zombie hasn't been collected by init, only that it's not in a running state This fixes the hang for both the Jenkins based CI as well as GitHub actions, and also insulates us against future hangs by ensuring the test will terminate with a timeout error instead of hanging indefinitely, so that we at least know _which_ test is the problem.
Per https://forums.swift.org/t/dropping-support-for-ubuntu-20-04/81109, the Swift project is dropping support for Ubuntu 20.04 (Focal) beginning in Swift 6.2 and later, so remove it from our testing matrix (it's failing now anyways).
In the CodeSignatureInfo.load method, when SecCodeCopySigningInformation fails, the code was incorrectly throwing MacError(result) instead of MacError(result2). This caused misleading error messages since it propagated the error code from the previous SecStaticCodeCreateWithPath call rather than the actual failing SecCodeCopySigningInformation call. The fix ensures accurate error reporting for code signing verification failures.
Add a new "Security" build settings group and an
"Enhanced Security" build setting that enables a number of security
settings at once, including:
* Enabling pointer authentication
* Enabling the typed allocator
* Enabling hardened libc++
* Enabling stack zero initialization
* Enabling security relevant compiler warnings
The goal is that enabling the Enhanced Security build setting
should enable all of these other settings by default and that
projects will be able to explicitly disable individual settings if needed.
rdar://151195113
|
@swift-ci test |
jakepetroules
requested review from
aciidgh,
jakepetroules,
mirza-garibovic,
mhrawdon,
neonichu and
owenv
as code owners
jakepetroules
approved these changes
Jul 29, 2025
mhrawdon
approved these changes
Jul 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.