Skip to content

Commit

Permalink
fix: api generation auto-updating packages (#114)
Browse files Browse the repository at this point in the history
Signed-off-by: Tronje Krop <[email protected]>
  • Loading branch information
tkrop committed Nov 1, 2024
1 parent c97fdf5 commit 2b568a3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export GOPATH ?= $(shell $(GO) env GOPATH)
export GOBIN ?= $(GOPATH)/bin

# Setup go-make version to use desired build and config scripts.
GOMAKE_DEP ?= github.com/tkrop/[email protected].110
GOMAKE_DEP ?= github.com/tkrop/[email protected].111
INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto
# Request targets from go-make targets target.
TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.110
0.0.111
2 changes: 1 addition & 1 deletion config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export GOPATH ?= $(shell $(GO) env GOPATH)
export GOBIN ?= $(GOPATH)/bin

# Setup go-make version to use desired build and config scripts.
GOMAKE_DEP ?= github.com/tkrop/[email protected].110
GOMAKE_DEP ?= github.com/tkrop/[email protected].111
INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto
# Request targets from go-make targets target.
TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \
Expand Down
8 changes: 4 additions & 4 deletions config/Makefile.base
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ go-pkg = $(shell awk -v mode="$(2)" -v filter="$(3)" \


# Setup go-make to use desired build and config scripts.
GOMAKE_DEP := github.com/tkrop/[email protected].110
GOMAKE_DEP := github.com/tkrop/[email protected].111
GOMAKE_MAKEFILE := $(realpath $(firstword $(MAKEFILE_LIST)))
GOMAKE_MAKEFILES := $(GOMAKE_MAKEFILE) \
$(wildcard Makefile.vars) $(wildcard Makefile.ext)
Expand Down Expand Up @@ -913,7 +913,7 @@ $(GEN_KUBE_APIS):: gen-kube-apis/%: $(GEN_KUBE_TARGETS)
$(call emsg,info,generate apis skipped [$${BPKG}]); exit 0; \
else $(call emsg,info,generate apis [$${BPKG}]); fi; \
\
go get k8s.io/api/core/v1; \
$(GO) get k8s.io/api/core/v1; \
for APKG in $$(find $${BPKG} -path "*/apis/*/*" -type d); do \
MANDIR="$${BPKG}/manifests"; \
APIPKG="$(GITURL)/$${APKG}"; APIBPKG="$${APIPKG%/*/*}"; \
Expand All @@ -940,7 +940,7 @@ $(GEN_KUBE_APIS):: gen-kube-apis/%: $(GEN_KUBE_TARGETS)
--listers-package "$${CLIPKG}/listers" "$${APIPKG}"; \
done; \
$(call emsg,info,update packages [$${BPKG}]); \
$(GO) get -u ./$${BPKG}/clients/...; \
$(GO) get ./$${BPKG}/clients/...; \


## Test: targets to test the source code (and compiler environment).
Expand Down Expand Up @@ -1795,7 +1795,7 @@ update-go::
fi; \
if [[ "$${VERSION}" < "1.21" ]]; then \
sed -E -i -e "s/$(GOMOD_REGEX)/\1$${VERSION%\.*}/;" go.mod; \
go mod tidy -go=$${VERSION%\.*}; \
$(GO) mod tidy -go=$${VERSION%\.*}; \
fi; \
for FILE in $(DELIVERY); do \
if [ -f "$${FILE}" ]; then \
Expand Down

0 comments on commit 2b568a3

Please sign in to comment.