Skip to content

Commit

Permalink
Merge pull request #2815 from owncloud/embed-generate-improvements
Browse files Browse the repository at this point in the history 
go embed / generate improvements
  • Loading branch information
@wkloucek
wkloucek authored Nov 24, 2021
2 parents 60eccf1 + 62ff1f1 commit bc57d13
Show file tree
Hide file tree
Showing 17 changed files with 5 additions and 12 deletions.
1 change: 1 addition & 0 deletions accounts/accounts.go
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
Empty file.
2 changes: 1 addition & 1 deletion web/web.go
View file
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
View file
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:

0 comments on commit bc57d13

Please sign in to comment.