From 8b4785ee85d1b884af55f2178c8c35f4f23a9daf Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 21 Feb 2024 22:49:29 +0800 Subject: [PATCH 1/5] Avoid migrate linux failure --- modules/repository/repo.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/repository/repo.go b/modules/repository/repo.go index fc3af040719ff..998ddb10a4d66 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -352,7 +352,11 @@ func SyncReleasesWithTags(ctx context.Context, repo *repo_model.Repository, gitR } if err := PushUpdateAddTag(ctx, repo, gitRepo, tagName, sha1, refname); err != nil { - return fmt.Errorf("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) + // ref https://github.com/torvalds/linux/tree/v2.6.11 + // this is a tree object, not a tag object which created before git + if sha1 != "c39ae07f393806ccf406ef966e9a15afc43cc36aobjectname" { + return fmt.Errorf("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) + } } return nil From f2b29dd747e7947b7e58517a2d9dfcac9d5862ba Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 21 Feb 2024 22:50:09 +0800 Subject: [PATCH 2/5] Fix sha1 --- modules/repository/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/repository/repo.go b/modules/repository/repo.go index 998ddb10a4d66..4d3249e2b321b 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -354,7 +354,7 @@ func SyncReleasesWithTags(ctx context.Context, repo *repo_model.Repository, gitR if err := PushUpdateAddTag(ctx, repo, gitRepo, tagName, sha1, refname); err != nil { // ref https://github.com/torvalds/linux/tree/v2.6.11 // this is a tree object, not a tag object which created before git - if sha1 != "c39ae07f393806ccf406ef966e9a15afc43cc36aobjectname" { + if sha1 != "c39ae07f393806ccf406ef966e9a15afc43cc36a" { return fmt.Errorf("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) } } From 651cbf553aa038405f2bbca3bd10100233c9a25a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 22 Feb 2024 23:16:11 +0800 Subject: [PATCH 3/5] Follow wxiaoguang's suggestion --- modules/repository/repo.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/repository/repo.go b/modules/repository/repo.go index 4d3249e2b321b..b7d320ff174bf 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -352,11 +352,9 @@ func SyncReleasesWithTags(ctx context.Context, repo *repo_model.Repository, gitR } if err := PushUpdateAddTag(ctx, repo, gitRepo, tagName, sha1, refname); err != nil { - // ref https://github.com/torvalds/linux/tree/v2.6.11 + // sometimes, some tags will be sync failed. i.e. https://github.com/torvalds/linux/tree/v2.6.11 // this is a tree object, not a tag object which created before git - if sha1 != "c39ae07f393806ccf406ef966e9a15afc43cc36a" { - return fmt.Errorf("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) - } + log.Error("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) } return nil From 41f637002e98b2c31f8743e179e5d9b52ace2dbd Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 22 Feb 2024 23:24:40 +0800 Subject: [PATCH 4/5] Update modules/repository/repo.go Co-authored-by: wxiaoguang --- modules/repository/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/repository/repo.go b/modules/repository/repo.go index b7d320ff174bf..c196b9de6ed73 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -352,7 +352,7 @@ func SyncReleasesWithTags(ctx context.Context, repo *repo_model.Repository, gitR } if err := PushUpdateAddTag(ctx, repo, gitRepo, tagName, sha1, refname); err != nil { - // sometimes, some tags will be sync failed. i.e. https://github.com/torvalds/linux/tree/v2.6.11 + // sometimes, some tags will be sync failed. i.e. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tag/?h=v2.6.11 // this is a tree object, not a tag object which created before git log.Error("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) } From 14aa91e7f25a2acfd4247c9688ec02e66911d24c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 22 Feb 2024 23:25:41 +0800 Subject: [PATCH 5/5] Update modules/repository/repo.go --- modules/repository/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/repository/repo.go b/modules/repository/repo.go index c196b9de6ed73..39bdc6adcf804 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -354,7 +354,7 @@ func SyncReleasesWithTags(ctx context.Context, repo *repo_model.Repository, gitR if err := PushUpdateAddTag(ctx, repo, gitRepo, tagName, sha1, refname); err != nil { // sometimes, some tags will be sync failed. i.e. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tag/?h=v2.6.11 // this is a tree object, not a tag object which created before git - log.Error("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %w", tagName, repo.ID, repo.OwnerName, repo.Name, err) + log.Error("unable to PushUpdateAddTag: %q to Repo[%d:%s/%s]: %v", tagName, repo.ID, repo.OwnerName, repo.Name, err) } return nil