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

chore(deps): update tools to latest versions #3413

Merged
merged 3 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
10 changes: 5 additions & 5 deletions .binny.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ tools:
# used to sign mac binaries at release
- name: quill
version:
want: v0.4.2
want: v0.5.0
method: github-release
with:
repo: anchore/quill

# used for linting
- name: golangci-lint
version:
want: v1.61.0
want: v1.62.0
method: github-release
with:
repo: golangci/golangci-lint
Expand Down Expand Up @@ -58,7 +58,7 @@ tools:
# used to release all artifacts
- name: goreleaser
version:
want: v2.3.2
want: v2.4.4
method: github-release
with:
repo: goreleaser/goreleaser
Expand Down Expand Up @@ -103,15 +103,15 @@ tools:
# used for running all local and CI tasks
- name: task
version:
want: v3.39.2
want: v3.40.0
method: github-release
with:
repo: go-task/task

# used for triggering a release
- name: gh
version:
want: v2.60.1
want: v2.61.0
method: github-release
with:
repo: cli/cli
Expand Down
4 changes: 2 additions & 2 deletions cmd/syft/internal/commands/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ func validateScanArgs(cmd *cobra.Command, args []string) error {
return validateArgs(cmd, args, "an image/directory argument is required")
}

func validateArgs(cmd *cobra.Command, args []string, error string) error {
func validateArgs(cmd *cobra.Command, args []string, err string) error {
if len(args) == 0 {
// in the case that no arguments are given we want to show the help text and return with a non-0 return code.
if err := cmd.Help(); err != nil {
return fmt.Errorf("unable to display help: %w", err)
}
return fmt.Errorf("%v", error)
return fmt.Errorf("%v", err)
}

return cobra.MaximumNArgs(1)(cmd, args)
Expand Down
4 changes: 2 additions & 2 deletions cmd/syft/internal/ui/capture.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ const defaultStdoutLogBufferSize = 1024
// restore := CaptureStdoutToTraceLog()
// // here, stdout will be captured and redirected to the provided writer
// restore() // block until the output has all been sent to the writer and restore the original stdout
func CaptureStdoutToTraceLog() (close func()) {
func CaptureStdoutToTraceLog() func() {
return capture(&os.Stdout, newLogWriter(), defaultStdoutLogBufferSize)
}

func capture(target **os.File, writer io.Writer, bufSize int) (close func()) {
func capture(target **os.File, writer io.Writer, bufSize int) func() {
original := *target

r, w, _ := os.Pipe()
Expand Down
Loading