Merge pull request #64 from bitrise-io/fix-error-log

zsolt-marta-bitrise · web-flow · commit 9dba0fae7815 · 2024-11-25T11:16:05.000+01:00
fix: Return error if xcode commands fail
diff --git a/cmd/restoreXcodeDerivedDataFiles.go b/cmd/restoreXcodeDerivedDataFiles.go
@@ -73,7 +73,7 @@ var restoreXcodeDerivedDataFilesCmd = &cobra.Command{
 			}
 		}
 
-		tracker.LogRestoreFinished(time.Since(startT), err)
+		tracker.LogRestoreFinished(time.Since(startT), cmdError)
 		if cmdError != nil {
 			return fmt.Errorf("restore Xcode DerivedData from Bitrise Build Cache: %w", cmdError)
 		}
diff --git a/cmd/saveXcodeDerivedDataFiles.go b/cmd/saveXcodeDerivedDataFiles.go
@@ -76,9 +76,9 @@ var saveXcodeDerivedDataFilesCmd = &cobra.Command{
 			}
 		}
 
-		tracker.LogSaveFinished(time.Since(startT), err)
-		if err != nil {
-			return fmt.Errorf("save Xcode cache into Bitrise Build Cache: %w", err)
+		tracker.LogSaveFinished(time.Since(startT), cmdError)
+		if cmdError != nil {
+			return fmt.Errorf("save Xcode cache into Bitrise Build Cache: %w", cmdError)
 		}
 
 		logger.TInfof("✅ Cache directories saved into Bitrise Build Cache ")

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ var restoreXcodeDerivedDataFilesCmd = &cobra.Command{`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- tracker.LogRestoreFinished(time.Since(startT), err)`
	`76`	`+ tracker.LogRestoreFinished(time.Since(startT), cmdError)`
`77`	`77`	`if cmdError != nil {`
`78`	`78`	`return fmt.Errorf("restore Xcode DerivedData from Bitrise Build Cache: %w", cmdError)`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,9 @@ var saveXcodeDerivedDataFilesCmd = &cobra.Command{`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- tracker.LogSaveFinished(time.Since(startT), err)`
`80`		`- if err != nil {`
`81`		`- return fmt.Errorf("save Xcode cache into Bitrise Build Cache: %w", err)`
	`79`	`+ tracker.LogSaveFinished(time.Since(startT), cmdError)`
	`80`	`+ if cmdError != nil {`
	`81`	`+ return fmt.Errorf("save Xcode cache into Bitrise Build Cache: %w", cmdError)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`logger.TInfof("✅ Cache directories saved into Bitrise Build Cache ")`