Skip to content

Commit 1e5dd62

Browse files
authored
Skip check PRs ob a flag (#48)
1 parent 74de751 commit 1e5dd62

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

pkg/config/defaults.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ func newDefaults(project Project) Config {
1111
return Config{
1212
GithubWorkflowsRemovalGlob: "knative-*.y?ml",
1313
Branches: Branches{
14-
Main: "main",
15-
ReleaseNext: "release-next",
14+
Main: "main",
15+
ReleaseNext: "release-next",
16+
CheckPrPrefix: "ci/",
1617
ReleaseTemplates: ReleaseTemplates{
1718
Upstream: releaseTemplate,
1819
Downstream: releaseTemplate,
@@ -26,7 +27,7 @@ func newDefaults(project Project) Config {
2627
RefSpec: "v*",
2728
},
2829
ResyncReleases: ResyncReleases{
29-
NumberOf: 6, //nolint:gomnd
30+
NumberOf: 6, //nolint:mnd,gomnd
3031
},
3132
Messages: Messages{
3233
TriggerCI: ":robot: Synchronize branch `%s` to " +

pkg/config/structure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ type Messages struct {
4040
type Branches struct {
4141
Main string `json:"main" valid:"required"`
4242
ReleaseNext string `json:"releaseNext" valid:"required"`
43-
SyncCi string `json:"syncCi"`
43+
CheckPrPrefix string `json:"checkPrPrefix"`
44+
SkipCheckPr bool `json:"skipCheckPr"`
4445
ReleaseTemplates `json:"releaseTemplates"`
4546
Searches `json:"searches"`
4647
}

pkg/sync/create_pr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func (o Operation) createSyncReleaseNextPR() error {
1616
o.triggerCIMessage(),
1717
fmt.Sprintf(o.Config.Messages.TriggerCIBody, branches.ReleaseNext, branches.Main),
1818
branches.ReleaseNext,
19-
branches.SyncCi+branches.ReleaseNext,
19+
branches.CheckPrPrefix+branches.ReleaseNext,
2020
)
2121
}
2222

pkg/sync/resync_releases.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (r resyncRelease) run() error {
5757
if err != nil {
5858
return errors.Wrap(err, ErrSyncFailed)
5959
}
60-
syncBranch := r.Config.Branches.SyncCi + downstreamBranch
60+
syncBranch := r.Config.Branches.CheckPrPrefix + downstreamBranch
6161
r.Printf("Re-syncing release: %s\n", color.Blue(r.rel.String()))
6262
downstreamRemote := git.Remote{
6363
Name: "downstream",

pkg/sync/trigger_ci.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,16 @@ type triggerCI struct {
2929
func (c triggerCI) run() error {
3030
c.Println("Trigger CI")
3131

32-
// If SyncCi is not explicitly set (i.e., it's an empty string), skip this feature.
33-
if c.Config.Branches.SyncCi == "" {
34-
c.Println(color.Yellow("Skipping CI trigger because 'branches.syncCi' is not configured."))
32+
if c.Config.Branches.SkipCheckPr {
33+
c.Println(color.Yellow("Skipping CI Check PRs trigger"))
3534
return nil
3635
}
3736

3837
return runSteps([]step{
3938
c.checkout,
4039
c.addChange,
4140
c.commitChanges(c.triggerCIMessage()),
42-
c.pushBranch(c.Config.Branches.SyncCi + c.Config.Branches.ReleaseNext),
41+
c.pushBranch(c.Config.Branches.CheckPrPrefix + c.Config.Branches.ReleaseNext),
4342
})
4443
}
4544

@@ -49,7 +48,7 @@ func (c triggerCI) checkout() error {
4948
URL: c.Config.Downstream,
5049
}
5150
err := c.Repository.Checkout(remote, c.Config.Branches.ReleaseNext).
52-
As(c.Config.Branches.SyncCi + c.Config.Branches.ReleaseNext)
51+
As(c.Config.Branches.CheckPrPrefix + c.Config.Branches.ReleaseNext)
5352
return errors.Wrap(err, ErrSyncFailed)
5453
}
5554

0 commit comments

Comments
 (0)