Merge pull request #2815 from owncloud/embed-generate-improvements

go embed / generate improvements
2026-07-18 19:44:24 -04:00 · 2021-11-24 15:09:17 +01:00
parent 60eccf1f88 62ff1f1659
commit bc57d13489
17 changed files with 5 additions and 12 deletions
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )

+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
--- a/glauth/Makefile
+++ b/glauth/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/graph-explorer/graph_explorer.go
+++ b/graph-explorer/graph_explorer.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )

+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
--- a/graph/Makefile
+++ b/graph/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/idp/Makefile
+++ b/idp/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate: assets
--- a/idp/idp.go
+++ b/idp/idp.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )

+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
--- a/ocis-pkg/Makefile
+++ b/ocis-pkg/Makefile
@@ -27,7 +27,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -34,7 +34,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate: # ocis needs assets of all other modules
--- a/ocs/Makefile
+++ b/ocs/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/proxy/Makefile
+++ b/proxy/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/settings/settings.go
+++ b/settings/settings.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )

+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
--- a/storage/Makefile
+++ b/storage/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/store/Makefile
+++ b/store/Makefile
@@ -26,7 +26,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/thumbnails/Makefile
+++ b/thumbnails/Makefile
@@ -26,7 +26,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate:
--- a/web/assets/js/keep
+++ b/web/assets/js/keep
--- a/web/web.go
+++ b/web/web.go
@@ -4,6 +4,6 @@ import (
 	"embed"
 )

+//go:generate make generate
 //go:embed assets/*
-//go:embed assets/js/*
 var Assets embed.FS
--- a/webdav/Makefile
+++ b/webdav/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate: