Skip to content

Commit 9ef148a

Browse files
jolheisertechknowlogick
authored andcommitted
Fix migration releases (#9319) (#9326) (#9328)
* Only sync tags after all batches (#9319) Signed-off-by: jolheiser <[email protected]> * Add SyncTags to uploader interface (#9326) * Add sync tags to interface Signed-off-by: jolheiser <[email protected]> * Fix revive Signed-off-by: jolheiser <[email protected]>
1 parent f11df80 commit 9ef148a

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

modules/migrations/base/uploader.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ type Uploader interface {
1212
CreateTopics(topic ...string) error
1313
CreateMilestones(milestones ...*Milestone) error
1414
CreateReleases(releases ...*Release) error
15+
SyncTags() error
1516
CreateLabels(labels ...*Label) error
1617
CreateIssues(issues ...*Issue) error
1718
CreateComments(comments ...*Comment) error

modules/migrations/gitea.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,12 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
288288

289289
rels = append(rels, &rel)
290290
}
291-
if err := models.InsertReleases(rels...); err != nil {
292-
return err
293-
}
294291

295-
// sync tags to releases in database
292+
return models.InsertReleases(rels...)
293+
}
294+
295+
// SyncTags syncs releases with tags in the database
296+
func (g *GiteaLocalUploader) SyncTags() error {
296297
return models.SyncReleasesWithTags(g.repo, g.gitRepo)
297298
}
298299

modules/migrations/migrate.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
165165
}
166166
releases = releases[relBatchSize:]
167167
}
168+
169+
// Once all releases (if any) are inserted, sync any remaining non-release tags
170+
if err := uploader.SyncTags(); err != nil {
171+
return err
172+
}
168173
}
169174

170175
var commentBatchSize = uploader.MaxBatchInsertSize("comment")

0 commit comments

Comments
 (0)