Fixed merge issues

elegantchaos · Sep 10, 2024 · c381221 · c381221
1 parent 8fd3b54
commit c381221
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Sources/ReleaseTools/Commands/WaitForNotarizationCommand.swift b/Sources/ReleaseTools/Commands/WaitForNotarizationCommand.swift
@@ -89,7 +89,6 @@ struct WaitForNotarizationCommand: AsyncParsableCommand {
 
     parsed.log("Tagging.")
     let git = GitRunner()
-    let tagResult = git.run([
     let tagResult = git.run([
       "tag", parsed.versionTag, "-f", "-m", "Uploaded with \(CommandLine.name)",
     ])

diff --git a/Sources/ReleaseTools/Runners/XCodeBuildRunner.swift b/Sources/ReleaseTools/Runners/XCodeBuildRunner.swift
@@ -23,7 +23,7 @@ class XCodeBuildRunner: Runner {
         let schemes = try decoder.decode(SchemesSpec.self, from: output)
         return schemes.workspace.schemes
       } else {
-        print(await result.stderr)
+        print(await result.stderr.string)
       }
     }