8000 break loop when succeeded by teru01 · Pull Request #105 · ubie-oss/flow · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

break loop when succeeded #105

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.

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
merged 2 commits into from
Jul 7, 2025
Merged
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
162 changes: 85 additions & 77 deletions flow/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,93 +63,101 @@ func (f *Flow) process(ctx context.Context, app *Application, version string) Pu
continue
}
for attempt := 1; attempt <= f.maxRetries; attempt++ {
release := newRelease(*app, manifest, version, fmt.Sprintf("%d", attempt))

oldVersionSet := map[string]interface{}{}
for _, filePath := range manifest.Files {
release.MakeChangeFunc(ctx, client, filePath, fmt.Sprintf(imageRewriteRegexTemplate, app.Image), func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
return fmt.Sprintf("%s:%s", app.Image, version)
})
release.MakeChangeFunc(ctx, client, filePath, versionRewriteRegex, func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
if f.enableVersionQuote {
return fmt.Sprintf("version: \"%s\"", version)
}
return fmt.Sprintf("version: %s", version)
})

for _, key := range app.AdditionalRewriteKeys {
release.MakeChangeFunc(ctx, client, filePath, fmt.Sprintf(additionalRewriteKeysRegexTemplate, key), func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
if f.enableVersionQuote {
return fmt.Sprintf("%s: \"%s\"", key, version)
}
return fmt.Sprintf("%s: %s", key, version)
})
}
for _, prefix := range app.AdditionalRewritePrefix {
release.MakeChangeFunc(ctx, client, filePath, fmt.Sprintf(additionalRewritePrefixRegexTemplate, prefix), func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
return fmt.Sprintf("%s%s", prefix, version)
})
}
err := f.processAttempt(ctx, client, app, manifest, version, attempt, &prs)
if err == nil {
break
}
}
}
return prs
}

oldVersions := []string{}
for oldVersion := range oldVersionSet {
oldVersions = append(oldVersions, oldVersion)
func (f *Flow) processAttempt(ctx context.Context, client *github.Client, app *Application, manifest Manifest, version string, attempt int, prs *PullRequests) error {
release := newRelease(*app, manifest, version, fmt.Sprintf("%d", attempt))

oldVersionSet := map[string]interface{}{}
for _, filePath := range manifest.Files {
release.MakeChangeFunc(ctx, client, filePath, fmt.Sprintf(imageRewriteRegexTemplate, app.Image), func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
return fmt.Sprintf("%s:%s", app.Image, version)
})
release.MakeChangeFunc(ctx, client, filePath, versionRewriteRegex, func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
if f.enableVersionQuote {
return fmt.Sprintf("version: \"%s\"", version)
}
body := generateBody(ctx, client, app, manifest, version, oldVersions)
release.SetBody(body)
return fmt.Sprintf("version: %s", version)
})

for _, key := range app.AdditionalRewriteKeys {
release.MakeChangeFunc(ctx, client, filePath, fmt.Sprintf(additionalRewriteKeysRegexTemplate, key), func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
if f.enableVersionQuote {
return fmt.Sprintf("%s: \"%s\"", key, version)
}
return fmt.Sprintf("%s: %s", key, version)
})
}
for _, prefix := range app.AdditionalRewritePrefix {
release.MakeChangeFunc(ctx, client, filePath, fmt.Sprintf(additionalRewritePrefixRegexTemplate, prefix), func(m regexp2.Match) string {
oldVersionSet[m.GroupByName("version").String()] = nil
return fmt.Sprintf("%s%s", prefix, version)
})
}
}

oldVersions := []string{}
for oldVersion := range oldVersionSet {
oldVersions = append(oldVersions, oldVersion)
}
body := generateBody(ctx, client, app, manifest, version, oldVersions)
release.SetBody(body)

err := release.Commit(ctx, client)
if err != nil {
log.Printf("Error Commiting: %s", err)
return err
}

err := release.Commit(ctx, client)
if !manifest.CommitWithoutPR {
url, err := release.CreatePR(ctx, client)
if err != nil {
log.Printf("Error Submitting PR: %s", err)
return err
}
*prs = append(*prs, PullRequest{
env: manifest.Env,
url: *url,
})

if f.enableAutoMerge && url != nil {
parts := strings.Split(*url, "/")
// Extract repository owner and name from the URL
// URL format: https://github.com/{owner}/{repo}/pull/{number}
if len(parts) < 5 {
log.Printf("Invalid PR URL format: %s", *url)
return fmt.Errorf("invalid PR URL format: %s", *url)
}
prNumber, err := strconv.Atoi(parts[len(parts)-1])
if err != nil {
log.Printf("Error Commiting: %s", err)
continue
log.Printf("Error extracting PR number from URL %s: %s", *url, err)
return fmt.Errorf("error extracting PR number from URL %s: %w", *url, err)
}
repoOwner := parts[len(parts)-4]
repoName := parts[len(parts)-3]

if !manifest.CommitWithoutPR {
url, err := release.CreatePR(ctx, client)
if err != nil {
log.Printf("Error Submitting PR: %s", err)
continue
}
prs = append(prs, PullRequest{
env: manifest.Env,
url: *url,
})

if f.enableAutoMerge && url != nil {
parts := strings.Split(*url, "/")
// Extract repository owner and name from the URL
// URL format: https://github.com/{owner}/{repo}/pull/{number}
if len(parts) < 5 {
log.Printf("Invalid PR URL format: %s", *url)
continue
}
prNumber, err := strconv.Atoi(parts[len(parts)-1])
if err != nil {
log.Printf("Error extracting PR number from URL %s: %s", *url, err)
continue
}
repoOwner := parts[len(parts)-4]
repoName := parts[len(parts)-3]

_, _, err = client.PullRequests.Merge(ctx, repoOwner, repoName, prNumber, "Auto-merged by flow", &github.PullRequestOptions{
MergeMethod: "squash",
})
if err != nil {
log.Printf("Error merging PR #%d: %s", prNumber, err)
continue
} else {
log.Printf("Successfully auto-merged PR #%d", prNumber)
}
}
_, _, err = client.PullRequests.Merge(ctx, repoOwner, repoName, prNumber, "Auto-merged by flow", &github.PullRequestOptions{
MergeMethod: "squash",
})
if err != nil {
log.Printf("Error merging PR #%d: %s", prNumber, err)
return fmt.Errorf("error merging PR #%d: %w", prNumber, err)
} else {
log.Printf("Successfully auto-merged PR #%d", prNumber)
}
}
}
return prs
return nil
}

func shouldProcess(m Manifest, version string) bool {
Expand Down
Loading
0