Skip to content

Allow task spec to filter command line for signature #507

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
May 13, 2025
Merged

Allow task spec to filter command line for signature #507

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ec135
Allow task spec to filter command line for signature
May 13, 2025
27a7bf1
Fall back to original command line if transform returns nil
May 13, 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
4 changes: 2 additions & 2 deletions Sources/SWBTaskExecution/TaskActions/TaskAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ open class TaskAction: PlannedTaskAction, PolymorphicSerializable
{
let md5 = InsecureHashContext()
md5.add(bytes: serializedRepresentationSignature!)
for arg in task.commandLine {
md5.add(bytes: arg.asByteString)
for arg in task.type.commandLineForSignature(for: task) ?? [] {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the meaning of a nil result here? Should the fallback be the regular command line instead of empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You seem to be right: https://github.com/swiftlang/swift-build/blob/main/Sources/SWBTaskExecution/BuildDescription.swift#L941

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

md5.add(bytes: arg)
md5.add(number: 0)
}
task.environment.computeSignature(into: md5)
Expand Down