diff --git a/go.mod b/go.mod index 7a8518d9e..8a4672368 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/google/go-cmp v0.7.0 github.com/openshift/api v0.0.0-20250430175214-d22fca85e3b9 - github.com/openshift/build-machinery-go v0.0.0-20250414185254-3ce8e800ceda + github.com/openshift/build-machinery-go v0.0.0-20250806130835-622c0378eb0d github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1 github.com/openshift/library-go v0.0.0-20250512121900-863508cf7a27 github.com/prometheus/client_golang v1.19.1 diff --git a/go.sum b/go.sum index 34b03140d..21f494a3e 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,8 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/openshift/api v0.0.0-20250430175214-d22fca85e3b9 h1:uYgMHVkkumIvJzGJzkoUie4KVZDEZk13qUTJENL9UH0= github.com/openshift/api v0.0.0-20250430175214-d22fca85e3b9/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= -github.com/openshift/build-machinery-go v0.0.0-20250414185254-3ce8e800ceda h1:Yjnmq1n4zf1pTwao3EAgkG5o++6iOuxfxGVDwj2Kfrs= -github.com/openshift/build-machinery-go v0.0.0-20250414185254-3ce8e800ceda/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= +github.com/openshift/build-machinery-go v0.0.0-20250806130835-622c0378eb0d h1:iwdrJUzp+GsbCNL84aZtSYwKSjrtxUJJ0cnVH8OsIeU= +github.com/openshift/build-machinery-go v0.0.0-20250806130835-622c0378eb0d/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1 h1:2HPG58V07TrrSGBviNPd0PY42vYHPPCIEwj/pb9nUlY= github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1/go.mod h1:kH5mjMfcHCF0tEnxwvNJTLMnlbrEt3Ua+vMVGvBOK5w= github.com/openshift/library-go v0.0.0-20250512121900-863508cf7a27 h1:9gC5e5821g15dahkbhKd8njBU8l/3l+0LgGvlMKWs2I= diff --git a/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk b/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk index 3b71e29dd..0c72a276c 100644 --- a/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk +++ b/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk @@ -3,11 +3,12 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST))), \ ) go_files_count :=$(words $(GO_FILES)) +chunk_size :=1000 verify-gofmt: $(info Running `$(GOFMT) $(GOFMT_FLAGS)` on $(go_files_count) file(s).) @TMP=$$( mktemp ); \ - $(GOFMT) $(GOFMT_FLAGS) $(GO_FILES) | tee $${TMP}; \ + find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -print | xargs -n $(chunk_size) $(GOFMT) $(GOFMT_FLAGS) | tee $${TMP}; \ if [ -s $${TMP} ]; then \ echo "$@ failed - please run \`make update-gofmt\`"; \ exit 1; \ @@ -16,7 +17,7 @@ verify-gofmt: update-gofmt: $(info Running `$(GOFMT) $(GOFMT_FLAGS) -w` on $(go_files_count) file(s).) - @$(GOFMT) $(GOFMT_FLAGS) -w $(GO_FILES) + @find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -print | xargs -n $(chunk_size) $(GOFMT) $(GOFMT_FLAGS) -w .PHONY: update-gofmt diff --git a/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk b/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk index 07726d87c..0854374fe 100644 --- a/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk +++ b/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk @@ -8,8 +8,7 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST))), \ YQ_VERSION ?=2.4.0 YQ ?=$(PERMANENT_TMP_GOPATH)/bin/yq-$(YQ_VERSION) -yq_dir :=$(dir $(YQ)) - +yq_dir =$(dir $(YQ)) ensure-yq: ifeq "" "$(wildcard $(YQ))" diff --git a/vendor/modules.txt b/vendor/modules.txt index 2f5cab058..55797c272 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -271,7 +271,7 @@ github.com/openshift/api/template github.com/openshift/api/template/v1 github.com/openshift/api/user github.com/openshift/api/user/v1 -# github.com/openshift/build-machinery-go v0.0.0-20250414185254-3ce8e800ceda +# github.com/openshift/build-machinery-go v0.0.0-20250806130835-622c0378eb0d ## explicit; go 1.22.0 github.com/openshift/build-machinery-go github.com/openshift/build-machinery-go/make