Merge branch version/0-36-0-RC2 to adopt changes from PR #2337

as-builds · as-builds · commit 3c95cd0682ef · 2023-01-31T22:20:35.000Z
diff --git a/cmd/state-exec/main.go b/cmd/state-exec/main.go
@@ -88,7 +88,7 @@ func run() error {
 		logr.Debug("                 sock - error: %v", err)
 
 		if onCI() { // halt control flow on CI only
-			return fmt.Errorf("cannot send message to service: %w", err)
+			return fmt.Errorf("cannot send message to service (this error is handled in CI only): %w", err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func run() error {`
`88`	`88`	`logr.Debug(" sock - error: %v", err)`
`89`	`89`
`90`	`90`	`if onCI() { // halt control flow on CI only`
`91`		`- return fmt.Errorf("cannot send message to service: %w", err)`
	`91`	`+ return fmt.Errorf("cannot send message to service (this error is handled in CI only): %w", err)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`