Skip to content

Merge release/6.2 into main #568

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.

Sign up for GitHub

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

Closed
wants to merge 10 commits into from
Closed

Merge release/6.2 into main #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64fe518
Expose DYLIB_INSTALL_NAME_BASE and SWIFT_INDEX_STORE_ENABLE in PIF API
owenv May 26, 2025
c3cb10e
Merge pull request #526 from swiftlang/owenv/expose-settings
owenv Jun 3, 2025
f65c7d9
Revert "Expose DYLIB_INSTALL_NAME_BASE and SWIFT_INDEX_STORE_ENABLE i…
owenv Jun 3, 2025
a92ce6b
Merge pull request #549 from swiftlang/revert-526-owenv/expose-settings
owenv Jun 3, 2025
74f40c1
SWIFT_SYSTEM_INCLUDE_PATHS doesn't work everywhere SWIFT_INCLUDE_PATH…
ian-twilightcoder Jun 2, 2025
502cfa3
Merge pull request #547 from ian-twilightcoder/SWIFT_SYSTEM_INCLUDE_P…
ian-twilightcoder Jun 3, 2025
80074f0
Unskip tests blocked by requireThreadSafeWorkingDirectory
jakepetroules Jun 2, 2025
60e7a94
Test the Isystem flag before using -Isystem
ian-twilightcoder Jun 4, 2025
68d6704
Merge pull request #555 from ian-twilightcoder/Isystem-feature-flag
ian-twilightcoder Jun 4, 2025
24ed393
Merge branch 'main' into automerge/merge-main-2025-06-09_09-02
jakepetroules Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Sources/SWBUtil/Process.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ extension Process {
case .linux:
// Amazon Linux 2 has glibc 2.26, and glibc 2.29 is needed for posix_spawn_file_actions_addchdir_np support
FileManager.default.contents(atPath: "/etc/system-release").map { String(decoding: $0, as: UTF8.self) == "Amazon Linux release 2 (Karoo)\n" } ?? false
case .openbsd:
true
default:
false
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/SWBBuildSystemTests/BuildTaskBehaviorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ fileprivate struct BuildTaskBehaviorTests: CoreBasedTests {
}

/// Check that we honor specs which are unsafe to interrupt.
@Test(.requireSDKs(.host), .skipHostOS(.windows, "no bash shell"), .skipHostOS(.freebsd, "Currently hangs on FreeBSD"))
@Test(.requireSDKs(.host), .skipHostOS(.windows, "no bash shell"))
func unsafeToInterrupt() async throws {
let fs = localFS
let output = MakePlannedVirtualNode("<WAIT>")
Expand Down
Loading