Merge pull request #491 from flipt-io/ars-202410301359

swift packaging: remove leading slash on tree-filter
flipt-io · Oct 30, 2024 · 7ce6cb3 · 7ce6cb3
2 parents 8f30bb9 + 0d07df9
commit 7ce6cb3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/package/ffi/sdks/swift.go b/package/ffi/sdks/swift.go
@@ -55,14 +55,13 @@ func (s *SwiftSDK) Build(ctx context.Context, client *dagger.Client, hostDirecto
 		WithWorkdir("/src").
 		WithFile("Sources/FliptEngineFFI.xcframework/ios-arm64/Headers/flipt_engine.h", hostDirectory.File("flipt-engine-ffi/include/flipt_engine.h")).
 		WithFile("Sources/FliptEngineFFI.xcframework/ios-arm64-simulator/Headers/flipt_engine.h", hostDirectory.File("flipt-engine-ffi/include/flipt_engine.h")).
-		WithFile("Sources/FliptEngineFFI.xcframework/ios-arm64/libfliptengine.a", hostDirectory.File("tmp/glibc/ios_arm64/libfliptengine.a")).
-		WithFile("Sources/FliptEngineFFI.xcframework/ios-arm64-simulator/libfliptengine.a", hostDirectory.File("tmp/glibc/ios_arm64_sim/libfliptengine.a"))
+		WithDirectory("/tmp/ext", hostDirectory.Directory("tmp/glibc"))
 
 	filtered := repository.
 		WithEnvVariable("FILTER_BRANCH_SQUELCH_WARNING", "1").
 		WithExec([]string{"git", "filter-branch", "-f", "--prune-empty",
 			"--subdirectory-filter", "flipt-client-swift",
-			"--tree-filter", "cp -r /tmp/ext .",
+			"--tree-filter", "cp -r /tmp/ext/glibc/ios_arm64/libfliptengine.a Sources/FliptEngineFFI.xcframework/ios-arm64/; cp -r /tmp/ext/glibc/ios_arm64_sim/libfliptengine.a Sources/FliptEngineFFI.xcframework/ios-arm64-simulator/",
 			"--", opts.Tag})
 
 	_, err := filtered.Sync(ctx)