Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/config/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 " +
Expand Down
3 changes: 2 additions & 1 deletion pkg/config/structure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/sync/create_pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/sync/resync_releases.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 4 additions & 5 deletions pkg/sync/trigger_ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,16 @@ 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
}

return runSteps([]step{
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),
})
}

Expand All @@ -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)
}

Expand Down
Loading