Fix CI issue: move non-manifest resources to new macOS Resources syml…

…inked dir
firebase · Mar 20, 2024 · 3bae8c5 · 3bae8c5
1 parent 20d2b47
commit 3bae8c5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
@@ -501,8 +501,13 @@ struct ZipBuilder {
                 // Ignore anything that not a framework.
                 guard fileManager.isDirectory(at: frameworkPath),
                       frameworkPath.lastPathComponent.hasSuffix("framework") else { continue }
-                let resourcesDir = frameworkPath.appendingPathComponent("Resources")
-                try fileManager.copyItem(at: xcResourceDir, to: resourcesDir)
+                let resourcesDir = frameworkPath.appendingPathComponent("Resources").resolvingSymlinksInPath()
+                let xcResourceDirContents = try! fileManager.contentsOfDirectory(at: xcResourceDir, includingPropertiesForKeys: nil)
+                let resourcesDirContents = try! fileManager.contentsOfDirectory(at: resourcesDir, includingPropertiesForKeys: nil)
+
+                for file in Set(xcResourceDirContents).subtracting(resourcesDirContents) {
+                  try fileManager.copyItem(at: file, to: resourcesDir.appendingPathComponent(file.lastPathComponent))
+                }
               }
             }
             try fileManager.removeItem(at: xcResourceDir)