...
 
Commits (2)
......@@ -26,7 +26,7 @@ func listProjects() ([]*gitlab.Project, error) {
var projects []*gitlab.Project
page := 1
for {
partial, resp, err := salsa.Groups.ListGroupProjects(group, &gitlab.ListGroupProjectsOptions{Page: page})
partial, resp, err := salsa.Groups.ListGroupProjects(group, &gitlab.ListGroupProjectsOptions{ListOptions: gitlab.ListOptions{Page: page}})
if err != nil {
return nil, err
}
......
......@@ -59,9 +59,11 @@ func FixSettings(p *gitlab.Project) error {
opt.SharedRunnersEnabled = gitlab.Bool(false)
change = true
}
// See https://salsa.debian.org/go-team/ci/issues/1
const maintainerOverride = "debian/.gitlab-ci.yml"
// requires https://github.com/xanzy/go-gitlab/pull/306
if got, want := p.CIConfigPath, ciFileName; got == nil || *got != want {
log.Printf("%s: setting ci config path to %q", p.PathWithNamespace, want)
if got, want := p.CIConfigPath, ciFileName; got == nil || (*got != want && *got != maintainerOverride) {
log.Printf("%s: setting ci config path from %q to %q", p.PathWithNamespace, got, want)
opt.CIConfigPath = gitlab.String(ciFileName)
change = true
}
......