Skip to content

Fix use of absolute paths to Swift SDK metatadata #212

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.

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 3 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,16 @@ extension SwiftSDKGenerator {
ArtifactsArchiveMetadata(
schemaVersion: "1.0",
artifacts: artifacts.mapValues {
.init(
var relativePath = $0
let prefixRemoved = relativePath.removePrefix(pathsConfiguration.artifactBundlePath)
assert(prefixRemoved)

return .init(
type: .swiftSDK,
version: self.bundleVersion,
variants: [
.init(
path: $0.string,
path: relativePath.string,
supportedTriples: hostTriples.map { $0.map(\.triple) }
)
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ import XCTest

@testable import SwiftSDKGenerator

#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif

final class SwiftSDKGeneratorMetadataTests: XCTestCase {
let logger = Logger(label: "SwiftSDKGeneratorMetadataTests")

Expand Down Expand Up @@ -54,19 +60,44 @@ final class SwiftSDKGeneratorMetadataTests: XCTestCase {

// Make sure the file exists
let sdkSettingsFile = sdkDirPath.appending("SDKSettings.json")
let fileExists = await sdk.doesFileExist(at: sdkSettingsFile)
var fileExists = await sdk.doesFileExist(at: sdkSettingsFile)
XCTAssertTrue(fileExists)

// Read back file, make sure it contains the expected data
let data = String(data: try await sdk.readFile(at: sdkSettingsFile), encoding: .utf8)
XCTAssertNotNil(data)
XCTAssertTrue(data!.contains(testCase.bundleVersion))
XCTAssertTrue(data!.contains("(\(testCase.targetTriple.archName))"))
XCTAssertTrue(data!.contains(linuxDistribution.description))
XCTAssertTrue(data!.contains(testCase.expectedCanonicalName))
let maybeString = String(data: try await sdk.readFile(at: sdkSettingsFile), encoding: .utf8)
let string = try XCTUnwrap(maybeString)
XCTAssertTrue(string.contains(testCase.bundleVersion))
XCTAssertTrue(string.contains("(\(testCase.targetTriple.archName))"))
XCTAssertTrue(string.contains(linuxDistribution.description))
XCTAssertTrue(string.contains(testCase.expectedCanonicalName))

// Cleanup
try await sdk.removeFile(at: sdkSettingsFile)

try await sdk.createDirectoryIfNeeded(at: sdk.pathsConfiguration.artifactBundlePath)

// Generate bundle metadata
try await sdk.generateArtifactBundleManifest(
hostTriples: [sdk.targetTriple],
artifacts: ["foo": sdk.pathsConfiguration.artifactBundlePath.appending("bar.json")]
)

// Make sure the file exists
let archiveMetadataFile = await sdk.pathsConfiguration.artifactBundlePath.appending("info.json")
fileExists = await sdk.doesFileExist(at: archiveMetadataFile)
XCTAssertTrue(fileExists)

// Read back file, make sure it contains the expected data
let data = try await sdk.readFile(at: archiveMetadataFile)
let decodedMetadata = try JSONDecoder().decode(ArtifactsArchiveMetadata.self, from: data)
XCTAssertEqual(decodedMetadata.artifacts.count, 1)
for (id, artifact) in decodedMetadata.artifacts {
XCTAssertEqual(id, "foo")
XCTAssertEqual(artifact.variants, [.init(path: "bar.json", supportedTriples: [testCase.targetTriple.triple])])
}

// Cleanup
try await sdk.removeFile(at: archiveMetadataFile)
}
}
}