Skip to content

Make configuration optional in BuildEnvironment #5849

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 1 commit into from
Oct 28, 2022
Merged

Make configuration optional in BuildEnvironment #5849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/PackageModel/BuildEnvironment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
/// A build environment with which to evaluation conditions.
public struct BuildEnvironment: Codable {
public let platform: Platform
public let configuration: BuildConfiguration
public let configuration: BuildConfiguration?

public init(platform: Platform, configuration: BuildConfiguration) {
public init(platform: Platform, configuration: BuildConfiguration? = nil) {
self.platform = platform
self.configuration = configuration
}
Expand Down
6 changes: 5 additions & 1 deletion Sources/PackageModel/Manifest/PackageConditionDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ public struct ConfigurationCondition: PackageConditionProtocol {
}

public func satisfies(_ environment: BuildEnvironment) -> Bool {
configuration == environment.configuration
if environment.configuration == nil {
return true
} else {
return configuration == environment.configuration
}
}
}
2 changes: 1 addition & 1 deletion Tests/BuildTests/MockBuildTestHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func mockBuildParameters(environment: BuildEnvironment) -> BuildParameters {
fatalError("unsupported platform in tests")
}

return mockBuildParameters(config: environment.configuration, destinationTriple: triple)
return mockBuildParameters(config: environment.configuration ?? .debug, destinationTriple: triple)
}

enum BuildError: Swift.Error {
Expand Down