Skip to content
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

Switch eks go readme update to occur on release #1281

Merged
merged 1 commit into from
Dec 12, 2023
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
11 changes: 8 additions & 3 deletions tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,15 @@ func ReleaseArtifacts(ctx context.Context, r *Release, dryrun bool, email, user
}

// Create new branch
commitBranch := fmt.Sprintf("release-%s", r.GoMinorVersion())
commitBranch := fmt.Sprintf("release-%s", r.EksGoReleaseVersion())
if err := gClient.Branch(commitBranch); err != nil {
logger.Error(err, "git branch", "branch name", r.GoMinorVersion(), "repo", forkUrl, "client", gClient)
logger.Error(err, "git branch", "branch name", commitBranch, "repo", forkUrl, "client", gClient)
return err
}

// Update Readme for new patch versions of golang
if err := updateVersionReadme(gClient, r); err != nil {
logger.Error(err, "Update Readme")
return err
}

Expand All @@ -54,7 +60,6 @@ func ReleaseArtifacts(ctx context.Context, r *Release, dryrun bool, email, user
logger.Error(err, "updating release file", "release", r.EksGoReleaseVersion())
return err
}

// Commit files and create PR
prSubject := fmt.Sprintf(releasePRSubjectFmt, r.EksGoReleaseVersion())
prDescription := fmt.Sprintf(releasePRDescriptionFmt, r.EksGoReleaseVersion())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ func UpdateVersion(ctx context.Context, r *Release, dryrun bool, email, user str
return err
}

// Update files for new patch versions of golang
if err := updateVersionReadme(gClient, r); err != nil {
logger.Error(err, "Update Readme")
return err
}

// Since this doesn't require a backport set and pass false
if err := updateGoSpec(gClient, r); err != nil {
logger.Error(err, "Update Readme")
return err
Expand Down
Loading