Skip to content

Workaround in ZipArchiver when posix_spawn_file_actions_addchdir_np is unavailable #7187

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

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Workaround in ZipArchiver when posix_spawn_file_actions_addchdir_np is unavailable #7187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c4208
Workaround in ZipArchiver when posix_spawn_file_actions_addchdir_np i…
yim-lee Dec 12, 2023
27c24b9
Use TSC.Process
yim-lee Dec 13, 2023
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
15 changes: 12 additions & 3 deletions Sources/Basics/Archiver/ZipArchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift open source project
//
// Copyright (c) 2014-2022 Apple Inc. and the Swift project authors
// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See http://swift.org/LICENSE.txt for license information
Expand Down Expand Up @@ -91,9 +91,18 @@ public struct ZipArchiver: Archiver, Cancellable {
workingDirectory: directory.parentDirectory.underlying
)
#else
// This is to work around `swift package-registry publish` tool failing on
// Amazon Linux 2 due to it having an earlier Glibc version (rdar://116370323)
// and therefore posix_spawn_file_actions_addchdir_np is unavailable.
// Instead of passing `workingDirectory` param to TSC.Process, which will trigger
// SPM_posix_spawn_file_actions_addchdir_np_supported check, we shell out and
// do `cd` explicitly before `zip`.
let process = TSCBasic.Process(
arguments: ["zip", "-r", destinationPath.pathString, directory.basename],
workingDirectory: directory.parentDirectory.underlying
arguments: [
"/bin/sh",
"-c",
"cd \(directory.parentDirectory.underlying.pathString) && zip -r \(destinationPath.pathString) \(directory.basename)",
]
)
#endif

Expand Down