Ensure to also reset any Git untracked files

JamitLabs · Apr 19, 2019 · 94323c1 · 94323c1
1 parent f607f57
commit 94323c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift b/Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift
@@ -36,6 +36,7 @@ extension DependencyInstaller {
                 if try FileManager.default.isDirectory(atPath: frameworkCheckoutPath) {
                     try bash("git -C '\(frameworkCheckoutPath)' reset HEAD --hard --quiet 2> /dev/null")
                     try bash("git -C '\(frameworkCheckoutPath)' clean -fd --quiet 2> /dev/null")
+                    try bash("git -C '\(frameworkCheckoutPath)' clean -fdX --quiet 2> /dev/null")
                 }
             }
         }

diff --git a/Sources/AccioKit/Services/CarthageBuilderService.swift b/Sources/AccioKit/Services/CarthageBuilderService.swift
@@ -48,6 +48,7 @@ final class CarthageBuilderService {
         try bash("rm -rf '\(framework.projectDirectory)/Carthage/Build'")
         try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet 2> /dev/null")
         try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet 2> /dev/null")
+        try bash("git -C '\(framework.projectDirectory)' clean -fdX --quiet 2> /dev/null")
 
         guard FileManager.default.fileExists(atPath: frameworkProduct.frameworkDirPath) && FileManager.default.fileExists(atPath: frameworkProduct.symbolsFilePath) else {
             print("Failed to build products to \(platformBuildDir)/\(framework.libraryName).framework(.dSYM).", level: .error)