From 8a517a8596e11b87f5c54baf1d55d113fd3e3409 Mon Sep 17 00:00:00 2001 From: Michalis Zampetakis Date: Wed, 6 Sep 2023 22:40:25 +0300 Subject: [PATCH] Do not list archived repos for all forges (#2374) Bitbucket seems that does not support repository archiving. Resolves: https://github.com/woodpecker-ci/woodpecker/issues/2235 --------- Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com> --- server/forge/gitea/gitea.go | 3 +++ server/forge/github/github.go | 7 ++++++- server/forge/gitlab/gitlab.go | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go index 55e3e90b1..4c60718ea 100644 --- a/server/forge/gitea/gitea.go +++ b/server/forge/gitea/gitea.go @@ -269,6 +269,9 @@ func (c *Gitea) Repos(ctx context.Context, u *model.User) ([]*model.Repo, error) ) result := make([]*model.Repo, 0, len(repos)) for _, repo := range repos { + if repo.Archived { + continue + } result = append(result, toRepo(repo)) } return result, err diff --git a/server/forge/github/github.go b/server/forge/github/github.go index 5f644a644..42cab9aec 100644 --- a/server/forge/github/github.go +++ b/server/forge/github/github.go @@ -209,7 +209,12 @@ func (c *client) Repos(ctx context.Context, u *model.User) ([]*model.Repo, error if err != nil { return nil, err } - repos = append(repos, convertRepoList(list)...) + for _, repo := range list { + if repo.GetArchived() { + continue + } + repos = append(repos, convertRepo(repo)) + } opts.Page = resp.NextPage } return repos, nil diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go index 89faa2e5a..c34b33dc7 100644 --- a/server/forge/gitlab/gitlab.go +++ b/server/forge/gitlab/gitlab.go @@ -70,6 +70,7 @@ func New(opts Opts) (forge.Forge, error) { ClientID: opts.ClientID, ClientSecret: opts.ClientSecret, SkipVerify: opts.SkipVerify, + HideArchives: true, }, nil }