Skip to content

NO-ISSUE: Remove setting the expectedMergeBase in commitchecker #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 1, 2026
Merged

NO-ISSUE: Remove setting the expectedMergeBase in commitchecker #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions pkg/v1/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ func applyConfig(ctx context.Context, logger *logrus.Entry, org, repo, branch, d
}
}

return writeCommitCheckerFile(ctx, logger, org, repo, branch, config.Target.Hash, dir, commitArgs)
return writeCommitCheckerFile(ctx, logger, org, repo, branch, dir, commitArgs)
}

func rewriteGoMod(ctx context.Context, logger *logrus.Entry, dir string, commits map[string]string, commitArgs []string) error {
Expand Down Expand Up @@ -968,7 +968,7 @@ func rewriteGoMod(ctx context.Context, logger *logrus.Entry, dir string, commits
return nil
}

func writeCommitCheckerFile(ctx context.Context, logger *logrus.Entry, org, repo, branch, expectedMergeBase, dir string, commitArgs []string) error {
func writeCommitCheckerFile(ctx context.Context, logger *logrus.Entry, org, repo, branch, dir string, commitArgs []string) error {
// TODO: move the upstream commit-checker code out of `main` package so we can import this and the regex
var config = struct {
// UpstreamOrg is the organization of the upstream repository
Expand All @@ -977,13 +977,10 @@ func writeCommitCheckerFile(ctx context.Context, logger *logrus.Entry, org, repo
UpstreamRepo string `json:"upstreamRepo,omitempty"`
// UpstreamBranch is the branch from the upstream repository we're tracking
UpstreamBranch string `json:"upstreamBranch,omitempty"`
// ExpectedMergeBase is the latest commit from the upstream that is expected to be present in this downstream
ExpectedMergeBase string `json:"expectedMergeBase,omitempty"`
}{
UpstreamOrg: org,
UpstreamRepo: repo,
UpstreamBranch: branch,
ExpectedMergeBase: expectedMergeBase,
UpstreamOrg: org,
UpstreamRepo: repo,
UpstreamBranch: branch,
}

raw, err := yaml.Marshal(&config)
Expand Down