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.

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

Correct a few issues with the golang tooling #1240

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Correct a few issues with the golang tooling #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2571210
point to aws repo for pr and fix bump release logic
rcrozean Nov 7, 2023
63a1953
update the readme template
rcrozean Nov 7, 2023
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
8 changes: 4 additions & 4 deletions tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/githubRelease.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ func bumpRelease(gClient git.Client, r *Release) error {
logger.Error(err, "Reading file", "file", releasePath)
return err
}
// We need to check there isn't a \n character if there is we only take the first value
if len(content) > 1 {
content = content[0:1]
// Check if there is a new line character at the end of the file, if so take all but the newline
if content[len(content)-1:] == "\n" {
content = content[0 : len(content)-1]
}
cr, err := strconv.Atoi(content)
if err != nil {
Expand Down Expand Up @@ -329,7 +329,7 @@ func createReleasePR(ctx context.Context, dryrun bool, r *Release, ghUser github
SourceOwner: ghUser.User(),
SourceRepo: constants.EksdBuildToolingRepoName,
PrRepo: constants.EksdBuildToolingRepoName,
PrRepoOwner: ghUser.User(),
PrRepoOwner: constants.AwsOrgName,
}
prm := prManager.New(retrier, githubClient, prmOpts)

Expand Down
2 changes: 1 addition & 1 deletion tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/versionReadmeFmt.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ Tracking Tag: `go%s`
The patches in `./patches` include relevant utility fixes for go `%s`.

### Spec
The RPM spec file in `./rpmbuild/SPECS` is sourced from the go %s SRPM available on Fedora, and modified to include the relevant patches and build the `go%s` source."
The RPM spec file in `./rpmbuild/SPECS` is sourced from the go %s SRPM available on Fedora, and modified to include the relevant patches and build the `go%s` source.
Loading