bring back protobuf

This commit is contained in:
jkoberg
2021-10-19 14:05:18 +02:00
parent 2356415099
commit e30c3b2270
6 changed files with 3 additions and 34 deletions

View File

@@ -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

View File

@@ -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:

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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

View File

@@ -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: