-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: Fix path to openapi-gen binary (#5089)
Signed-off-by: terrytangyuan <[email protected]>
- Loading branch information
1 parent
2ff4db1
commit 2f7c908
Showing
1 changed file
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,11 +106,11 @@ define protoc | |
-I /usr/local/include \ | ||
-I $(CURDIR) \ | ||
-I $(CURDIR)/vendor \ | ||
-I ${GOPATH}/src \ | ||
-I ${GOPATH}/pkg/mod/github.com/gogo/[email protected]/gogoproto \ | ||
-I ${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected]/third_party/googleapis \ | ||
--gogofast_out=plugins=grpc:${GOPATH}/src \ | ||
--grpc-gateway_out=logtostderr=true:${GOPATH}/src \ | ||
-I $(GOPATH)/src \ | ||
-I $(GOPATH)/pkg/mod/github.com/gogo/[email protected]/gogoproto \ | ||
-I $(GOPATH)/pkg/mod/github.com/grpc-ecosystem/[email protected]/third_party/googleapis \ | ||
--gogofast_out=plugins=grpc:$(GOPATH)/src \ | ||
--grpc-gateway_out=logtostderr=true:$(GOPATH)/src \ | ||
--swagger_out=logtostderr=true,fqn_for_swagger_name=true:. \ | ||
$(1) | ||
perl -i -pe 's|argoproj/argo-workflows/|argoproj/argo-workflows/v3/|g' `echo "$(1)" | sed 's/proto/pb.go/g'` | ||
|
@@ -298,7 +298,7 @@ $(GOPATH)/bin/goimports: | |
pkg/apis/workflow/v1alpha1/generated.proto: $(GOPATH)/bin/go-to-protobuf $(PROTO_BINARIES) $(TYPES) | ||
go mod vendor | ||
[ -e v3 ] || ln -s . v3 | ||
${GOPATH}/bin/go-to-protobuf \ | ||
$(GOPATH)/bin/go-to-protobuf \ | ||
--go-header-file=./hack/custom-boilerplate.go.txt \ | ||
--packages=github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1 \ | ||
--apimachinery-packages=+k8s.io/apimachinery/pkg/util/intstr,+k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime/schema,+k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/api/core/v1,k8s.io/api/policy/v1beta1 \ | ||
|
@@ -498,7 +498,7 @@ clean: | |
|
||
pkg/apis/workflow/v1alpha1/openapi_generated.go: $(GOPATH)/bin/openapi-gen $(TYPES) | ||
[ -e v3 ] || ln -s . v3 | ||
openapi-gen \ | ||
$(GOPATH)/bin/openapi-gen \ | ||
--go-header-file ./hack/custom-boilerplate.go.txt \ | ||
--input-dirs github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1 \ | ||
--output-package github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1 \ | ||
|
@@ -509,7 +509,7 @@ pkg/apis/workflow/v1alpha1/openapi_generated.go: $(GOPATH)/bin/openapi-gen $(TYP | |
# generates many other files (listers, informers, client etc). | ||
pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go: $(TYPES) | ||
[ -e v3 ] || ln -s . v3 | ||
bash ${GOPATH}/pkg/mod/k8s.io/[email protected]/generate-groups.sh \ | ||
bash $(GOPATH)/pkg/mod/k8s.io/[email protected]/generate-groups.sh \ | ||
"deepcopy,client,informer,lister" \ | ||
github.com/argoproj/argo-workflows/v3/pkg/client github.com/argoproj/argo-workflows/v3/pkg/apis \ | ||
workflow:v1alpha1 \ | ||
|