Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go embed / generate improvements #2815

Merged
merged 3 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions accounts/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import (
"embed"
)

//go:generate make generate
//go:embed assets/*
var Assets embed.FS
1 change: 0 additions & 1 deletion glauth/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 1 addition & 0 deletions graph-explorer/graph_explorer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import (
"embed"
)

//go:generate make generate
//go:embed assets/*
var Assets embed.FS
1 change: 0 additions & 1 deletion graph/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 0 additions & 1 deletion idp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions idp/idp.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import (
"embed"
)

//go:generate make generate
//go:embed assets/*
var Assets embed.FS
1 change: 0 additions & 1 deletion ocis-pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 0 additions & 1 deletion ocis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ocs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 0 additions & 1 deletion proxy/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions settings/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import (
"embed"
)

//go:generate make generate
//go:embed assets/*
var Assets embed.FS
1 change: 0 additions & 1 deletion storage/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 0 additions & 1 deletion store/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion thumbnails/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Empty file removed web/assets/js/keep
Empty file.
2 changes: 1 addition & 1 deletion web/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import (
"embed"
)

//go:generate make generate
//go:embed assets/*
//go:embed assets/js/*
var Assets embed.FS
1 change: 0 additions & 1 deletion webdav/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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: