Merge branch 'master' into attempt-instant-ddl

timvaillancourt · web-flow · commit cfd83728edb9 · 2022-11-14T22:09:55.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/replica-tests.yml b/.github/workflows/replica-tests.yml
@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         version: [mysql-5.7.25,mysql-8.0.16]
diff --git a/go/logic/migrator.go b/go/logic/migrator.go
@@ -1059,6 +1059,7 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) {
 	)
 	w := io.MultiWriter(writers...)
 	fmt.Fprintln(w, status)
+	this.migrationContext.Log.Infof(status)
 
 	hooksStatusIntervalSec := this.migrationContext.HooksStatusIntervalSec
 	if hooksStatusIntervalSec > 0 && elapsedSeconds%hooksStatusIntervalSec == 0 {

Original file line number	Diff line number	Diff line change
`@@ -1059,6 +1059,7 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) {`
`1059`	`1059`	`)`
`1060`	`1060`	`w := io.MultiWriter(writers...)`
`1061`	`1061`	`fmt.Fprintln(w, status)`
	`1062`	`+ this.migrationContext.Log.Infof(status)`
`1062`	`1063`
`1063`	`1064`	`hooksStatusIntervalSec := this.migrationContext.HooksStatusIntervalSec`
`1064`	`1065`	`if hooksStatusIntervalSec > 0 && elapsedSeconds%hooksStatusIntervalSec == 0 {`