diff --git a/Makefile b/Makefile index 8759e2a..74e4e52 100644 --- a/Makefile +++ b/Makefile @@ -6,19 +6,19 @@ SHELL = /bin/bash -o pipefail TEST_IMAGE = busybox:latest # Tool versions ################################# -GOLANG_CI_VERSION = v1.52.2 +GOLANG_CI_VERSION = v1.61.0 GOBOUNCER_VERSION = v0.4.0 -GORELEASER_VERSION = v1.19.1 +GORELEASER_VERSION = v1.26.2 GOSIMPORTS_VERSION = v0.3.8 -CHRONICLE_VERSION = v0.6.0 -GLOW_VERSION = v1.5.0 +CHRONICLE_VERSION = v0.8.0 +GLOW_VERSION = v1.5.1 DOCKER_CLI_VERSION = 23.0.6 # Command templates ################################# LINT_CMD = $(TEMP_DIR)/golangci-lint run --tests=false --timeout=2m --config .golangci.yaml GOIMPORTS_CMD = $(TEMP_DIR)/gosimports -local github.com/wagoodman RELEASE_CMD = DOCKER_CLI_VERSION=$(DOCKER_CLI_VERSION) $(TEMP_DIR)/goreleaser release --clean -SNAPSHOT_CMD = $(RELEASE_CMD) --skip-publish --snapshot --skip-sign +SNAPSHOT_CMD = $(RELEASE_CMD) --skip=publish --skip=sign --snapshot CHRONICLE_CMD = $(TEMP_DIR)/chronicle GLOW_CMD = $(TEMP_DIR)/glow diff --git a/dive/filetree/efficiency.go b/dive/filetree/efficiency.go index d1244d1..7713b1e 100644 --- a/dive/filetree/efficiency.go +++ b/dive/filetree/efficiency.go @@ -65,7 +65,7 @@ func Efficiency(trees []*FileTree) (float64, EfficiencySlice) { stackedTree, failedPaths, err := StackTreeRange(trees, 0, currentTree-1) if len(failedPaths) > 0 { for _, path := range failedPaths { - logrus.Errorf(path.String()) + logrus.Errorf("%s", path.String()) } } if err != nil { diff --git a/dive/filetree/file_tree.go b/dive/filetree/file_tree.go index b6b0668..d74a350 100644 --- a/dive/filetree/file_tree.go +++ b/dive/filetree/file_tree.go @@ -269,7 +269,7 @@ func (tree *FileTree) AddPath(filepath string, data FileInfo) (*FileNode, []*Fil if node == nil { // the child could not be added - return node, addedNodes, fmt.Errorf(fmt.Sprintf("could not add child node: '%s' (path:'%s')", name, filepath)) + return node, addedNodes, fmt.Errorf("could not add child node: '%s' (path:'%s')", name, filepath) } } diff --git a/runtime/ui/key/binding.go b/runtime/ui/key/binding.go index be77f6b..ff7c1a7 100644 --- a/runtime/ui/key/binding.go +++ b/runtime/ui/key/binding.go @@ -33,7 +33,7 @@ func GenerateBindings(gui *gocui.Gui, influence string, infos []BindingInfo) ([] var err error var binding *Binding - if info.ConfigKeys != nil && len(info.ConfigKeys) > 0 { + if len(info.ConfigKeys) > 0 { binding, err = NewBindingFromConfig(gui, influence, info.ConfigKeys, info.Display, info.OnAction) } else { binding, err = NewBinding(gui, influence, info.Key, info.Modifier, info.Display, info.OnAction) diff --git a/runtime/ui/view/layer_details.go b/runtime/ui/view/layer_details.go index bfcb425..fe6d394 100644 --- a/runtime/ui/view/layer_details.go +++ b/runtime/ui/view/layer_details.go @@ -79,7 +79,7 @@ func (v *LayerDetails) Render() error { var lines = make([]string, 0) tags := "(none)" - if v.CurrentLayer.Names != nil && len(v.CurrentLayer.Names) > 0 { + if len(v.CurrentLayer.Names) > 0 { tags = strings.Join(v.CurrentLayer.Names, ", ") } lines = append(lines, []string{