From 1d62377d713f00939f9aed8c85ed4a22a42e4b89 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 8 Sep 2021 23:42:28 +0800 Subject: [PATCH 1/3] Fix bug of migrated repository not index --- modules/task/migrate.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/task/migrate.go b/modules/task/migrate.go index 481422403ba98..af215848d13e4 100644 --- a/modules/task/migrate.go +++ b/modules/task/migrate.go @@ -117,6 +117,7 @@ func runMigrateTask(t *models.Task) (err error) { _ = t.UpdateCols("message") }) if err == nil { + t.Repo = repo log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name) return } From ac5c9d1e48dfa516a995835292b18d95ed8f770d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 9 Sep 2021 00:05:56 +0800 Subject: [PATCH 2/3] follow @zeripath idea --- modules/task/migrate.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/task/migrate.go b/modules/task/migrate.go index af215848d13e4..c1d38cf9bc8fd 100644 --- a/modules/task/migrate.go +++ b/modules/task/migrate.go @@ -107,7 +107,7 @@ func runMigrateTask(t *models.Task) (err error) { return } - repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts, func(format string, args ...interface{}) { + t.Repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts, func(format string, args ...interface{}) { message := models.TranslatableMessage{ Format: format, Args: args, @@ -117,7 +117,6 @@ func runMigrateTask(t *models.Task) (err error) { _ = t.UpdateCols("message") }) if err == nil { - t.Repo = repo log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name) return } From ef0ab41554791cb9141a136320aff3c01eb72388 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 9 Sep 2021 00:07:43 +0800 Subject: [PATCH 3/3] Fix bug --- modules/task/migrate.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/task/migrate.go b/modules/task/migrate.go index c1d38cf9bc8fd..52f4bb91cf722 100644 --- a/modules/task/migrate.go +++ b/modules/task/migrate.go @@ -93,7 +93,6 @@ func runMigrateTask(t *models.Task) (err error) { } opts.MigrateToRepoID = t.RepoID - var repo *models.Repository ctx, cancel := context.WithCancel(graceful.GetManager().ShutdownContext()) defer cancel() @@ -117,7 +116,7 @@ func runMigrateTask(t *models.Task) (err error) { _ = t.UpdateCols("message") }) if err == nil { - log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name) + log.Trace("Repository migrated [%d]: %s/%s", t.Repo.ID, t.Owner.Name, t.Repo.Name) return }