diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go index d509562..4db6201 100644 --- a/pkg/config/defaults.go +++ b/pkg/config/defaults.go @@ -11,8 +11,9 @@ func newDefaults(project Project) Config { return Config{ GithubWorkflowsRemovalGlob: "knative-*.y?ml", Branches: Branches{ - Main: "main", - ReleaseNext: "release-next", + Main: "main", + ReleaseNext: "release-next", + CheckPrPrefix: "ci/", ReleaseTemplates: ReleaseTemplates{ Upstream: releaseTemplate, Downstream: releaseTemplate, @@ -26,7 +27,7 @@ func newDefaults(project Project) Config { RefSpec: "v*", }, ResyncReleases: ResyncReleases{ - NumberOf: 6, //nolint:gomnd + NumberOf: 6, //nolint:mnd,gomnd }, Messages: Messages{ TriggerCI: ":robot: Synchronize branch `%s` to " + diff --git a/pkg/config/structure.go b/pkg/config/structure.go index 1f8e763..a9aea2b 100644 --- a/pkg/config/structure.go +++ b/pkg/config/structure.go @@ -40,7 +40,8 @@ type Messages struct { type Branches struct { Main string `json:"main" valid:"required"` ReleaseNext string `json:"releaseNext" valid:"required"` - SyncCi string `json:"syncCi"` + CheckPrPrefix string `json:"checkPrPrefix"` + SkipCheckPr bool `json:"skipCheckPr"` ReleaseTemplates `json:"releaseTemplates"` Searches `json:"searches"` } diff --git a/pkg/sync/create_pr.go b/pkg/sync/create_pr.go index 254161a..de97fe7 100644 --- a/pkg/sync/create_pr.go +++ b/pkg/sync/create_pr.go @@ -16,7 +16,7 @@ func (o Operation) createSyncReleaseNextPR() error { o.triggerCIMessage(), fmt.Sprintf(o.Config.Messages.TriggerCIBody, branches.ReleaseNext, branches.Main), branches.ReleaseNext, - branches.SyncCi+branches.ReleaseNext, + branches.CheckPrPrefix+branches.ReleaseNext, ) } diff --git a/pkg/sync/resync_releases.go b/pkg/sync/resync_releases.go index 6a2f268..57985aa 100644 --- a/pkg/sync/resync_releases.go +++ b/pkg/sync/resync_releases.go @@ -57,7 +57,7 @@ func (r resyncRelease) run() error { if err != nil { return errors.Wrap(err, ErrSyncFailed) } - syncBranch := r.Config.Branches.SyncCi + downstreamBranch + syncBranch := r.Config.Branches.CheckPrPrefix + downstreamBranch r.Printf("Re-syncing release: %s\n", color.Blue(r.rel.String())) downstreamRemote := git.Remote{ Name: "downstream", diff --git a/pkg/sync/trigger_ci.go b/pkg/sync/trigger_ci.go index be57481..e714c9e 100644 --- a/pkg/sync/trigger_ci.go +++ b/pkg/sync/trigger_ci.go @@ -29,9 +29,8 @@ type triggerCI struct { func (c triggerCI) run() error { c.Println("Trigger CI") - // If SyncCi is not explicitly set (i.e., it's an empty string), skip this feature. - if c.Config.Branches.SyncCi == "" { - c.Println(color.Yellow("Skipping CI trigger because 'branches.syncCi' is not configured.")) + if c.Config.Branches.SkipCheckPr { + c.Println(color.Yellow("Skipping CI Check PRs trigger")) return nil } @@ -39,7 +38,7 @@ func (c triggerCI) run() error { c.checkout, c.addChange, c.commitChanges(c.triggerCIMessage()), - c.pushBranch(c.Config.Branches.SyncCi + c.Config.Branches.ReleaseNext), + c.pushBranch(c.Config.Branches.CheckPrPrefix + c.Config.Branches.ReleaseNext), }) } @@ -49,7 +48,7 @@ func (c triggerCI) checkout() error { URL: c.Config.Downstream, } err := c.Repository.Checkout(remote, c.Config.Branches.ReleaseNext). - As(c.Config.Branches.SyncCi + c.Config.Branches.ReleaseNext) + As(c.Config.Branches.CheckPrPrefix + c.Config.Branches.ReleaseNext) return errors.Wrap(err, ErrSyncFailed) }