feat: add bot/no-rebase label

Author: bpsoraggi

pkg/conf/config.go

@@ -48,6 +48,7 @@ type Markers struct {
 	MergeMethodPrefix string `yaml:"mergeMethodPrefix,omitempty"`
 	MergeRetryPrefix  string `yaml:"mergeRetryPrefix,omitempty"`
 	NeedHumanMerge    string `yaml:"needHumanMerge,omitempty"`
+	NoRebase          string `yaml:"noRebase,omitempty"`
 	NoMerge           string `yaml:"noMerge,omitempty"`
 }
 
@@ -87,6 +88,7 @@ func Load(filename string) (Configuration, error) {
 			MergeRetryPrefix:  "bot/merge-retry-",
 			NeedHumanMerge:    "bot/need-human-merge",
 			NoMerge:           "bot/no-merge",
+			NoRebase:          "bot/no-rebase",
 		},
 		Retry: Retry{
 			Interval: 1 * time.Minute,
@@ -173,6 +175,7 @@ func validate(cfg Configuration) error {
 		"markers.mergeMethodPrefix": cfg.Markers.MergeMethodPrefix,
 		"markers.needHumanMerge":    cfg.Markers.NeedHumanMerge,
 		"markers.noMerge":           cfg.Markers.NoMerge,
+		"markers.noRebase":          cfg.Markers.NoRebase,
 	}
 
 	for field, value := range fields {

pkg/conf/config_test.go

@@ -40,6 +40,7 @@ func TestLoad(t *testing.T) {
 					MergeRetryPrefix:  "bot/merge-retry-",
 					NeedHumanMerge:    "bot/need-human-merge",
 					NoMerge:           "bot/no-merge",
+					NoRebase:          "bot/no-rebase",
 				},
 				Retry: Retry{
 					Interval:    1 * time.Minute,
@@ -110,6 +111,7 @@ func TestLoad(t *testing.T) {
 					MergeRetryPrefix:  "bot/merge-retry-",
 					NeedHumanMerge:    "bot/need-human-merge",
 					NoMerge:           "bot/no-merge",
+					NoRebase:          "bot/no-rebase",
 				},
 				Retry: Retry{
 					Interval:    1 * time.Minute,

pkg/repository/repository.go

@@ -113,6 +113,7 @@ func (r *Repository) process(ctx context.Context, pr *github.PullRequest) error
 			r.markers.MergeMethodPrefix + conf.MergeMethodMerge,
 			r.markers.MergeMethodPrefix + conf.MergeMethodRebase,
 			r.markers.MergeMethodPrefix + conf.MergeMethodFastForward,
+			r.markers.NoRebase,
 		}
 		err = r.removeLabels(ctx, pr, labelsToRemove)
 		ignoreError(ctx, err)
@@ -168,9 +169,16 @@ func (r *Repository) process(ctx context.Context, pr *github.PullRequest) error
 				return err
 			}
 		} else {
-			err := r.update(ctx, pr)
-			if err != nil {
-				return fmt.Errorf("failed to update: %w", err)
+			if hasLabel(pr, r.markers.NoRebase) {
+				err := r.merge(ctx, pr, mergeMethod)
+				if err != nil {
+					return err
+				}
+			} else {
+				err := r.update(ctx, pr)
+				if err != nil {
+					return fmt.Errorf("failed to update: %w", err)
+				}
 			}
 		}
 	} else {

pkg/repository/repository_merge.go

@@ -93,6 +93,7 @@ func (r *Repository) merge(ctx context.Context, pr *github.PullRequest, mergeMet
 			r.markers.MergeMethodPrefix + conf.MergeMethodMerge,
 			r.markers.MergeMethodPrefix + conf.MergeMethodRebase,
 			r.markers.MergeMethodPrefix + conf.MergeMethodFastForward,
+			r.markers.NoRebase,
 		}
 		err = r.removeLabels(ctx, pr, labelsToRemove)
 		ignoreError(ctx, err)

pkg/repository/repository_update.go

@@ -155,6 +155,10 @@ func (r *Repository) getUpdateAction(ctx context.Context, pr *github.PullRequest
 		return ActionMerge, nil
 	}
 
+	if hasLabel(pr, r.markers.NoRebase) {
+		return ActionMerge, nil
+	}
+
 	// action rebase
 	return ActionRebase, nil
 }