Update prebuild and incremental prebuild emojis

Author: gtsiolis

components/supervisor/pkg/supervisor/tasks.go

@@ -498,14 +498,14 @@ func (tm *tasksManager) watch(task *task, term *terminal.Term) {
 		duration := ""
 		if elapsed >= 1*time.Minute {
 			elapsedInMinutes := strconv.Itoa(int(math.Round(elapsed.Minutes())))
-			duration = "⏱️ Well done on saving " + elapsedInMinutes + " minute"
+			duration = "⏱️\bWell done on saving " + elapsedInMinutes + " minute"
 			if elapsedInMinutes != "1" {
 				duration += "s"
 			}
 			duration += "\r\n"
 		}
 
-		endMessage := "\r\n🍊 This task ran as a workspace prebuild\r\n" + duration + "\r\n"
+		endMessage := "\r\n⚡\bThis task ran as a workspace prebuild\r\n" + duration + "\r\n"
 		_, _ = writer.Write([]byte(endMessage))
 
 		if tm.reporter != nil {
@@ -526,20 +526,20 @@ func importParentLogAndGetDuration(fn string, out io.Writer) time.Duration {
 	}
 	defer file.Close()
 
-	defer out.Write([]byte("♻️ Re-running task as an incremental workspace prebuild\r\n\r\n"))
+	defer out.Write([]byte("📦\bRe-running task for incremental prebuild\r\n\r\n"))
 
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 		l := scanner.Text()
-		if strings.Contains(l, "🍊 This task ran as a workspace prebuild") {
+		if strings.Contains(l, "⚡\bThis task ran as a workspace prebuild") {
 			break
 		}
 		out.Write([]byte(l + "\n"))
 	}
 	if !scanner.Scan() {
 		return 0
 	}
-	reg, err := regexp.Compile(`⏱️ Well done on saving (\d+) minute`)
+	reg, err := regexp.Compile(`⏱️\bWell done on saving (\d+) minute`)
 	if err != nil {
 		return 0
 	}

test/tests/components/ws-manager/prebuild_test.go

@@ -190,7 +190,7 @@ func TestPrebuildWorkspaceTaskFail(t *testing.T) {
 
 const (
 	prebuildLogPath string = "/workspace/.gitpod"
-	prebuildLog     string = "'🍊 This task ran as a workspace prebuild'"
+	prebuildLog     string = "'⚡\bThis task ran as a workspace prebuild'"
 	initTask        string = "echo \"some output\" > someFile; sleep 10;"
 	regularPrefix   string = "ws-"
 )
@@ -889,7 +889,7 @@ func checkPVCObject(t *testing.T, api *integration.ComponentAPI, isPVCEnable boo
 
 // checkPrebuildLogExist checks the prebuild log message exists
 func checkPrebuildLogExist(t *testing.T, cfg *envconf.Config, rsa *integration.RpcClient, ws *integration.LaunchWorkspaceDirectlyResult, wsRoot string) {
-	// since the message '🍊 This task ran as a workspace prebuild' is generated by
+	// since the message '⚡ This task ran as a workspace prebuild' is generated by
 	// a prebuild workspace supervisor, so we add a retry mechanism to make sure that we
 	// won't check the message too earlier before the supervisor generated it.
 	var (
@@ -914,7 +914,7 @@ func checkPrebuildLogExist(t *testing.T, cfg *envconf.Config, rsa *integration.R
 
 	t.Logf("cannot found the prebuild message %s in %s, err:%v, exitCode:%d, stdout:%s", prebuildLog, prebuildLogPath, err, grepResp.ExitCode, grepResp.Stdout)
 
-	// somehow, the prebuild log message '🍊 This task ran as a workspace prebuild' does not exists
+	// somehow, the prebuild log message '⚡ This task ran as a workspace prebuild' does not exists
 	// we fall back to check the the init task message within the /workspace/.gitpod/prebuild-log-* or not
 	var grepResp1 agent.ExecResponse
 	var checkInitTaskMsg bool