From 86f27ca7669aaaa555058cd2918b094118e53c4d Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 16 Feb 2021 15:15:25 +0100 Subject: [PATCH] hook up graph and graph-explorer --- Makefile | 2 ++ graph-explorer/Makefile | 62 +++++++++++++---------------------------- graph/Makefile | 57 +++++++++++-------------------------- 3 files changed, 39 insertions(+), 82 deletions(-) diff --git a/Makefile b/Makefile index 350fad9241..0c1f50157a 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,8 @@ RESET := $(shell tput -Txterm sgr0) OCIS_MODULES = \ accounts \ glauth \ + graph \ + graph-explorer \ idp \ ocis \ ocis-pkg \ diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index ec9d98a354..725a18329e 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -80,10 +80,6 @@ staticcheck: lint: for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done; -.PHONY: generate -generate: assets - go generate $(GENERATE) - .PHONY: changelog changelog: go run github.com/restic/calens >| CHANGELOG.md @@ -140,52 +136,34 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: config-docs-generate -config-docs-generate: - go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md - .PHONY: watch watch: go run github.com/cespare/reflex -c reflex.conf -# $(GOPATH)/bin/protoc-gen-go: -# GO111MODULE=off go get -v github.com/golang/protobuf/protoc-gen-go +############ docs generate ############ -# $(GOPATH)/bin/protoc-gen-micro: -# GO111MODULE=off go get -v github.com/micro/protoc-gen-micro +.PHONY: docs-generate +docs-generate: config-docs-generate \ + grpc-docs-generate -# $(GOPATH)/bin/protoc-gen-microweb: -# GO111MODULE=off go get -v github.com/webhippie/protoc-gen-microweb +.PHONY: config-docs-generate +config-docs-generate: + go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md -# $(GOPATH)/bin/protoc-gen-swagger: -# GO111MODULE=off go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger +.PHONY: grpc-docs-generate +grpc-docs-generate: ../docs/extensions/${NAME}/grpc.md -# pkg/proto/v0/example.pb.go: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --go_out=logtostderr=true:pkg/proto/v0 example.proto +############ generate ############ +.PHONY: generate +generate: ci-node-generate ci-go-generate -# pkg/proto/v0/example.pb.micro.go: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --micro_out=logtostderr=true:pkg/proto/v0 example.proto +.PHONY: ci-go-generate +ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target + go generate $(GENERATE) -# pkg/proto/v0/example.pb.web.go: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --microweb_out=logtostderr=true:pkg/proto/v0 example.proto +.PHONY: ci-node-generate +ci-node-generate: -# pkg/proto/v0/example.swagger.json: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --swagger_out=logtostderr=true:pkg/proto/v0 example.proto - -# .PHONY: protobuf -# protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json - -assets: - mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ +.PHONY: pull-assets +pull-assets: + rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ diff --git a/graph/Makefile b/graph/Makefile index 4f153de6ec..e45952135d 100644 --- a/graph/Makefile +++ b/graph/Makefile @@ -80,10 +80,6 @@ staticcheck: lint: for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done; -.PHONY: generate -generate: - go generate $(GENERATE) - .PHONY: changelog changelog: go run github.com/restic/calens >| CHANGELOG.md @@ -140,49 +136,30 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: config-docs-generate -config-docs-generate: - go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md - .PHONY: watch watch: go run github.com/cespare/reflex -c reflex.conf -# $(GOPATH)/bin/protoc-gen-go: -# GO111MODULE=off go get -v github.com/golang/protobuf/protoc-gen-go +############ docs generate ############ -# $(GOPATH)/bin/protoc-gen-micro: -# GO111MODULE=off go get -v github.com/micro/protoc-gen-micro +.PHONY: docs-generate +docs-generate: config-docs-generate \ + grpc-docs-generate -# $(GOPATH)/bin/protoc-gen-microweb: -# GO111MODULE=off go get -v github.com/webhippie/protoc-gen-microweb +.PHONY: config-docs-generate +config-docs-generate: + go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md -# $(GOPATH)/bin/protoc-gen-swagger: -# GO111MODULE=off go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger +.PHONY: grpc-docs-generate +grpc-docs-generate: ../docs/extensions/${NAME}/grpc.md -# pkg/proto/v0/example.pb.go: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --go_out=pkg/proto/v0 example.proto +############ generate ############ +.PHONY: generate +generate: ci-node-generate ci-go-generate -# pkg/proto/v0/example.pb.micro.go: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --micro_out=pkg/proto/v0 example.proto +.PHONY: ci-go-generate +ci-go-generate: # CI runs ci-node-generate automatically before this target + go generate $(GENERATE) -# pkg/proto/v0/example.pb.web.go: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --microweb_out=pkg/proto/v0 example.proto - -# pkg/proto/v0/example.swagger.json: pkg/proto/v0/example.proto -# protoc \ -# -I=third_party/ \ -# -I=pkg/proto/v0/ \ -# --swagger_out=pkg/proto/v0 example.proto - -# .PHONY: protobuf -# protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json +.PHONY: ci-node-generate +ci-node-generate: