diff --git a/accounts/Makefile b/accounts/Makefile index 92d01381b5..1df6501402 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -31,8 +31,7 @@ docs-generate: config-docs-generate \ include ../.make/generate.mk .PHONY: ci-go-generate -ci-go-generate: # protobuf # CI runs ci-node-generate automatically before this target - # @go generate ./... +ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: yarn-build diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index 622172c8a4..bfa41d36c2 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -23,7 +23,6 @@ include ../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target - # @go generate ./... .PHONY: ci-node-generate ci-node-generate: diff --git a/ocis-pkg/assetsfs/assetsfs.go b/ocis-pkg/assetsfs/assetsfs.go index 3d2653b8a0..6f7c2ebbe9 100644 --- a/ocis-pkg/assetsfs/assetsfs.go +++ b/ocis-pkg/assetsfs/assetsfs.go @@ -61,10 +61,5 @@ func read(assetPath string, fileName string) (http.File, error) { return nil, err } - f, err := os.Open(p) - if err != nil { - return nil, err - } - - return f, nil + return os.Open(p) } diff --git a/onlyoffice/onlyoffice.go b/onlyoffice/onlyoffice.go deleted file mode 100644 index 1a0e715228..0000000000 --- a/onlyoffice/onlyoffice.go +++ /dev/null @@ -1,22 +0,0 @@ -package onlyoffice - -import ( - "embed" - "io/fs" - "net/http" -) - -//go:embed assets/* -var assets embed.FS - -// Assets FS -var Assets http.FileSystem - -func init() { - embedFS, err := fs.Sub(assets, "assets") - if err != nil { - panic(err) - } - - Assets = http.FS(embedFS) -} \ No newline at end of file diff --git a/settings/Makefile b/settings/Makefile index 16e9f8184d..785b2edd29 100644 --- a/settings/Makefile +++ b/settings/Makefile @@ -32,8 +32,7 @@ docs-generate: config-docs-generate \ include ../.make/generate.mk .PHONY: ci-go-generate -ci-go-generate: #protobuf # CI runs ci-node-generate automatically before this target - #@go generate ./... +ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: yarn-build diff --git a/web/Makefile b/web/Makefile index defc926d6d..e068b5bbfb 100644 --- a/web/Makefile +++ b/web/Makefile @@ -23,7 +23,6 @@ include ../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target - # @go generate ./... .PHONY: ci-node-generate ci-node-generate: