bring back protobuf
This commit is contained in:
+1
-2
@@ -31,8 +31,7 @@ docs-generate: config-docs-generate \
|
|||||||
include ../.make/generate.mk
|
include ../.make/generate.mk
|
||||||
|
|
||||||
.PHONY: ci-go-generate
|
.PHONY: ci-go-generate
|
||||||
ci-go-generate: # protobuf # CI runs ci-node-generate automatically before this target
|
ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
|
||||||
# @go generate ./...
|
|
||||||
|
|
||||||
.PHONY: ci-node-generate
|
.PHONY: ci-node-generate
|
||||||
ci-node-generate: yarn-build
|
ci-node-generate: yarn-build
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ include ../.make/generate.mk
|
|||||||
|
|
||||||
.PHONY: ci-go-generate
|
.PHONY: ci-go-generate
|
||||||
ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target
|
ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target
|
||||||
# @go generate ./...
|
|
||||||
|
|
||||||
.PHONY: ci-node-generate
|
.PHONY: ci-node-generate
|
||||||
ci-node-generate:
|
ci-node-generate:
|
||||||
|
|||||||
@@ -61,10 +61,5 @@ func read(assetPath string, fileName string) (http.File, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
f, err := os.Open(p)
|
return os.Open(p)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return f, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
|
||||||
}
|
|
||||||
+1
-2
@@ -32,8 +32,7 @@ docs-generate: config-docs-generate \
|
|||||||
include ../.make/generate.mk
|
include ../.make/generate.mk
|
||||||
|
|
||||||
.PHONY: ci-go-generate
|
.PHONY: ci-go-generate
|
||||||
ci-go-generate: #protobuf # CI runs ci-node-generate automatically before this target
|
ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
|
||||||
#@go generate ./...
|
|
||||||
|
|
||||||
.PHONY: ci-node-generate
|
.PHONY: ci-node-generate
|
||||||
ci-node-generate: yarn-build
|
ci-node-generate: yarn-build
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ include ../.make/generate.mk
|
|||||||
|
|
||||||
.PHONY: ci-go-generate
|
.PHONY: ci-go-generate
|
||||||
ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target
|
ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target
|
||||||
# @go generate ./...
|
|
||||||
|
|
||||||
.PHONY: ci-node-generate
|
.PHONY: ci-node-generate
|
||||||
ci-node-generate:
|
ci-node-generate:
|
||||||
|
|||||||
Reference in New Issue
Block a user