Skip to content

[pull] main from ko-build:main #96

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
pull merged 2 commits into from
May 16, 2025
Merged

[pull] main from ko-build:main #96

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
46a92ac
Revert "drop -m flag"
0xiso May 16, 2025
57cc763
Add withSBOMber option to Test_gobuilds
0xiso May 16, 2025
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
6 changes: 2 additions & 4 deletions pkg/build/gobuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,13 +464,11 @@ func goversionm(ctx context.Context, file string, appPath string, appFileName st
switch se.(type) {
case oci.SignedImage:
sbom := bytes.NewBuffer(nil)
// seems in go1.24 the -m flag breaks things
// tested with go1.23 and works, but starting with go1.24.0 it breaks
cmd := exec.CommandContext(ctx, gobin, "version", file)
cmd := exec.CommandContext(ctx, gobin, "version", "-m", file)
cmd.Stdout = sbom
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return nil, "", fmt.Errorf("go version %s: %w", file, err)
return nil, "", fmt.Errorf("go version -m %s: %w", file, err)
}

// In order to get deterministics SBOMs replace our randomized
Expand Down
1 change: 1 addition & 0 deletions pkg/build/gobuilds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func Test_gobuilds(t *testing.T) {
opts := []Option{
WithBaseImages(func(context.Context, string) (name.Reference, Result, error) { return baseRef, base, nil }),
withBuilder(writeTempFile),
withSBOMber(fauxSBOM),
WithPlatforms("all"),
}

Expand Down