Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TMPDIR ?= /tmp
# Setup default go-make installation flags.
INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto
# Setup go-make version to use desired build and config scripts.
GOMAKE_DEP ?= github.com/tkrop/go-make@v0.0.167
GOMAKE_DEP ?= github.com/tkrop/go-make@v0.0.168
# Request targets from go-make show-targets target.
TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \
$(GO) install $(INSTALL_FLAGS) $(GOMAKE_DEP) >&2 && \
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.167
0.0.168
2 changes: 1 addition & 1 deletion config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TMPDIR ?= /tmp
# Setup default go-make installation flags.
INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto
# Setup go-make version to use desired build and config scripts.
GOMAKE_DEP ?= github.com/tkrop/go-make@v0.0.167
GOMAKE_DEP ?= github.com/tkrop/go-make@v0.0.168
# Request targets from go-make show-targets target.
TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \
$(GO) install $(INSTALL_FLAGS) $(GOMAKE_DEP) >&2 && \
Expand Down
9 changes: 5 additions & 4 deletions config/Makefile.base
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ DIR_CACHE := $(abspath $(TMPDIR))/go-make-$(USER)$(DIR_REAL)
$(call cdebug,using DIR_CACHE [$(DIR_CACHE)])

# Setup go-make to use desired build and config scripts.
GOMAKE_DEP := github.com/tkrop/go-make@v0.0.167
GOMAKE_DEP := github.com/tkrop/go-make@v0.0.168
GOMAKE_PATH := $(GOPATH)/pkg/mod/$(GOMAKE_DEP)/config
GOMAKE_MAKEFILE := $(realpath $(firstword $(MAKEFILE_LIST)))
GOMAKE_CONFIG := $(patsubst %/,%,$(dir $(GOMAKE_MAKEFILE)))
Expand Down Expand Up @@ -322,8 +322,9 @@ go-install-module = \
go-install? = \
$(if $(wildcard $(GOBIN)/$(1)),:,$(call go-install-module,$(1),$(2)))
go-install = \
rm --force "$(GOBIN)/$(1)";$(if $(filter latest,$(call go-version,$(2))),, \
GONOSUMDB=$(call go-path,$(2))) $(GO) install $(INSTALL_FLAGS) "$(2)"
rm --force "$(GOBIN)/$(1)";$(if $(filter %-nosumdb,$(call go-version,$(2))), \
GONOSUMDB=$(call go-path,$(2)),) $(GO) install $(INSTALL_FLAGS) "$(patsubst \
%-nosumdb,%,$(2))"

# Function for determining the actual version of a go package from downloading.
VERSION_REGEX := 's/.*"Path":\s*"([^"]*)".*"Version":\s*"([^"]*)".*/\1@\2/g'
Expand Down Expand Up @@ -407,7 +408,7 @@ TOOLS_GO += \
go.uber.org/mock/mockgen \
github.com/tkrop/go-testing/cmd/mock \
github.com/itchyny/gojq/cmd/gojq \
github.com/mikefarah/yq/v4@v4.50.1 \
github.com/mikefarah/yq/v4 \
k8s.io/code-generator/cmd/deepcopy-gen@$(K8S_CODEGEN_VERSION) \
k8s.io/code-generator/cmd/client-gen@$(K8S_CODEGEN_VERSION) \
k8s.io/code-generator/cmd/lister-gen@$(K8S_CODEGEN_VERSION) \
Expand Down
Loading