Skip to content

Commit

Permalink
switch readme update to occur on release (#1281)
Browse files Browse the repository at this point in the history
  • Loading branch information
rcrozean authored Dec 12, 2023
1 parent 7041d9a commit 96bbef9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
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

0 comments on commit 96bbef9

Please sign in to comment.