From dbafbaa33371862caf2d62d9a0b0d7d5044535af Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 6 Mar 2025 11:38:55 +0100 Subject: [PATCH] fix: remove deprecations and use go-generate instead of go-generate-STAGE --- .make/default.mk | 11 ++++------- .make/deprecate.mk | 5 ----- Dockerfile | 2 +- Makefile | 15 +++------------ opencloud/Makefile | 1 - opencloud/docker/Dockerfile.linux.multiarch | 2 +- pkg/Makefile | 5 ++--- protogen/Makefile | 5 ++--- services/activitylog/Makefile | 1 - services/antivirus/Makefile | 5 ++--- services/app-provider/Makefile | 1 - services/app-registry/Makefile | 1 - services/audit/Makefile | 1 - services/auth-app/Makefile | 1 - services/auth-basic/Makefile | 1 - services/auth-bearer/Makefile | 1 - services/auth-machine/Makefile | 1 - services/auth-service/Makefile | 1 - services/clientlog/Makefile | 1 - services/collaboration/Makefile | 5 ++--- services/eventhistory/Makefile | 1 - services/frontend/Makefile | 1 - services/gateway/Makefile | 1 - services/graph/Makefile | 5 ++--- services/groups/Makefile | 1 - services/idm/Makefile | 1 - services/idp/Makefile | 1 - services/invitations/Makefile | 5 ++--- services/nats/Makefile | 1 - services/notifications/Makefile | 1 - services/ocdav/Makefile | 1 - services/ocm/Makefile | 1 - services/ocs/Makefile | 1 - services/policies/Makefile | 1 - services/postprocessing/Makefile | 1 - services/proxy/Makefile | 5 ++--- services/search/Makefile | 5 ++--- services/settings/Makefile | 5 ++--- services/sharing/Makefile | 1 - services/sse/Makefile | 1 - services/storage-publiclink/Makefile | 1 - services/storage-shares/Makefile | 1 - services/storage-system/Makefile | 1 - services/storage-users/Makefile | 1 - services/thumbnails/Makefile | 5 ++--- services/userlog/Makefile | 1 - services/users/Makefile | 1 - services/web/Makefile | 1 - services/webdav/Makefile | 1 - services/webfinger/Makefile | 1 - 50 files changed, 29 insertions(+), 91 deletions(-) delete mode 100644 .make/deprecate.mk diff --git a/.make/default.mk b/.make/default.mk index 0f77250593..8aa7536a74 100644 --- a/.make/default.mk +++ b/.make/default.mk @@ -4,20 +4,17 @@ node-generate-dev-default: node-generate-prod .PHONY: node-generate-prod-default node-generate-prod-default: noop -.PHONY: go-generate-dev-default -go-generate-dev-default: go-generate-prod - -.PHONY: go-generate-prod-default -go-generate-prod-default: noop +.PHONY: go-generate-default +go-generate-default: go-generate .PHONY: generate generate: generate-prod # production is always the default .PHONY: generate-prod-default -generate-prod-default: node-generate-prod go-generate-prod +generate-prod-default: node-generate-prod go-generate .PHONY: generate-dev-default -generate-dev-default: node-generate-dev go-generate-dev +generate-dev-default: node-generate-dev go-generate .PHONY: vet vet: noop diff --git a/.make/deprecate.mk b/.make/deprecate.mk deleted file mode 100644 index a86f85dbb5..0000000000 --- a/.make/deprecate.mk +++ /dev/null @@ -1,5 +0,0 @@ -.PHONY: ci-node-generate -ci-node-generate: node-generate-prod - -.PHONY: ci-go-generate -ci-go-generate: go-generate-prod diff --git a/Dockerfile b/Dockerfile index a79d3cab98..041a7a8a43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN apk add bash make git curl gcc musl-dev libc-dev binutils-gold inotify-tools COPY --from=generate /opencloud /opencloud WORKDIR /opencloud/opencloud -RUN make go-generate-prod build ENABLE_VIPS=true +RUN make go-generate build ENABLE_VIPS=true FROM alpine:3.20 diff --git a/Makefile b/Makefile index f37b2c12a1..c6266e5247 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ SHELL := bash -include .make/deprecate.mk - # define standard colors BLACK := $(shell tput -Txterm setaf 0) RED := $(shell tput -Txterm setaf 1) @@ -160,18 +158,11 @@ generate-dev: $(MAKE) -C $$mod generate-dev || exit 1; \ done -.PHONY: go-generate-prod -go-generate-prod: +.PHONY: go-generate +go-generate: @for mod in $(OC_MODULES); do \ printf '\n%s:\n---------------------------\n' $$mod; \ - $(MAKE) -C $$mod go-generate-prod || exit 1; \ - done - -.PHONY: go-generate-dev -go-generate-dev: - @for mod in $(OC_MODULES); do \ - printf '\n%s:\n---------------------------\n' $$mod; \ - $(MAKE) -C $$mod go-generate-dev || exit 1; \ + $(MAKE) -C $$mod go-generate || exit 1; \ done .PHONY: node-generate-prod diff --git a/opencloud/Makefile b/opencloud/Makefile index 158d5ce069..f8828ab377 100644 --- a/opencloud/Makefile +++ b/opencloud/Makefile @@ -9,7 +9,6 @@ endif include ../.bingo/Variables.mk include ../.make/default.mk -include ../.make/deprecate.mk include ../.make/recursion.mk include ../.make/go.mk include ../.make/release.mk diff --git a/opencloud/docker/Dockerfile.linux.multiarch b/opencloud/docker/Dockerfile.linux.multiarch index 8d2b0d3ede..3628ebe40d 100644 --- a/opencloud/docker/Dockerfile.linux.multiarch +++ b/opencloud/docker/Dockerfile.linux.multiarch @@ -8,7 +8,7 @@ COPY ./ /opencloud/ WORKDIR /opencloud RUN GOOS="${TARGETOS:-linux}" GOARCH="${TARGETARCH:-amd64}" ; \ - make go-generate-prod ; \ + make go-generate ; \ make -C opencloud release-linux-docker-${TARGETARCH} ENABLE_VIPS=true FROM alpine:3.20 diff --git a/pkg/Makefile b/pkg/Makefile index 6363488624..25fb10f0fb 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -3,12 +3,11 @@ NAME := pkg include ../.bingo/Variables.mk include ../.make/default.mk -include ../.make/deprecate.mk include ../.make/recursion.mk include ../.make/go.mk include ../.make/release.mk include ../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) diff --git a/protogen/Makefile b/protogen/Makefile index 16e81c69cc..a282dcd8ad 100644 --- a/protogen/Makefile +++ b/protogen/Makefile @@ -3,10 +3,9 @@ NAME := protogen include ../.bingo/Variables.mk include ../.make/default.mk -include ../.make/deprecate.mk include ../.make/recursion.mk include ../.make/generate.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) diff --git a/services/activitylog/Makefile b/services/activitylog/Makefile index dcadbb37db..4858a5e700 100644 --- a/services/activitylog/Makefile +++ b/services/activitylog/Makefile @@ -5,7 +5,6 @@ TEMPLATE_FILE = ./pkg/service/l10n/activitylog.pot include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/antivirus/Makefile b/services/antivirus/Makefile index 15af56c16f..112395e3ac 100644 --- a/services/antivirus/Makefile +++ b/services/antivirus/Makefile @@ -3,12 +3,11 @@ NAME := antivirus include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) diff --git a/services/app-provider/Makefile b/services/app-provider/Makefile index 3054de6349..563a79caa3 100644 --- a/services/app-provider/Makefile +++ b/services/app-provider/Makefile @@ -3,7 +3,6 @@ NAME := app-provider include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/app-registry/Makefile b/services/app-registry/Makefile index 08c2be7915..94fe404b1d 100644 --- a/services/app-registry/Makefile +++ b/services/app-registry/Makefile @@ -3,7 +3,6 @@ NAME := app-registry include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/audit/Makefile b/services/audit/Makefile index efba63fba3..93cefeb0c4 100644 --- a/services/audit/Makefile +++ b/services/audit/Makefile @@ -3,7 +3,6 @@ NAME := audit include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/auth-app/Makefile b/services/auth-app/Makefile index df4db7c26c..597bd4ea92 100644 --- a/services/auth-app/Makefile +++ b/services/auth-app/Makefile @@ -3,7 +3,6 @@ NAME := auth-app include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/auth-basic/Makefile b/services/auth-basic/Makefile index b61194756f..48665f35a2 100644 --- a/services/auth-basic/Makefile +++ b/services/auth-basic/Makefile @@ -3,7 +3,6 @@ NAME := auth-basic include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/auth-bearer/Makefile b/services/auth-bearer/Makefile index e3ae235211..46ec214a6d 100644 --- a/services/auth-bearer/Makefile +++ b/services/auth-bearer/Makefile @@ -3,7 +3,6 @@ NAME := auth-bearer include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/auth-machine/Makefile b/services/auth-machine/Makefile index 1963016e21..0ce7b637e7 100644 --- a/services/auth-machine/Makefile +++ b/services/auth-machine/Makefile @@ -3,7 +3,6 @@ NAME := auth-machine include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/auth-service/Makefile b/services/auth-service/Makefile index c50670d1ea..e1b744c2c8 100644 --- a/services/auth-service/Makefile +++ b/services/auth-service/Makefile @@ -3,7 +3,6 @@ NAME := auth-service include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/clientlog/Makefile b/services/clientlog/Makefile index 3f97dcd916..d7ac4ebc54 100644 --- a/services/clientlog/Makefile +++ b/services/clientlog/Makefile @@ -3,7 +3,6 @@ NAME := clientlog include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/collaboration/Makefile b/services/collaboration/Makefile index b3586724b9..48e1e9a3c6 100644 --- a/services/collaboration/Makefile +++ b/services/collaboration/Makefile @@ -3,12 +3,11 @@ NAME := collaboration include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) diff --git a/services/eventhistory/Makefile b/services/eventhistory/Makefile index c0ed54ce56..0cd2d08bcb 100644 --- a/services/eventhistory/Makefile +++ b/services/eventhistory/Makefile @@ -3,7 +3,6 @@ NAME := eventhistory include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/frontend/Makefile b/services/frontend/Makefile index c6ce1182fe..7557b2fa18 100644 --- a/services/frontend/Makefile +++ b/services/frontend/Makefile @@ -3,7 +3,6 @@ NAME := frontend include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/gateway/Makefile b/services/gateway/Makefile index f683f01dad..76c811f998 100644 --- a/services/gateway/Makefile +++ b/services/gateway/Makefile @@ -3,7 +3,6 @@ NAME := gateway include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/graph/Makefile b/services/graph/Makefile index 6ffc4cc022..0b276c194a 100644 --- a/services/graph/Makefile +++ b/services/graph/Makefile @@ -5,14 +5,13 @@ TEMPLATE_FILE = ./pkg/l10n/graph.pot include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) .PHONY: l10n-pull diff --git a/services/groups/Makefile b/services/groups/Makefile index 721fb9d7c9..89ee2fec99 100644 --- a/services/groups/Makefile +++ b/services/groups/Makefile @@ -3,7 +3,6 @@ NAME := groups include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/idm/Makefile b/services/idm/Makefile index 2876a43abc..33be9c75b6 100644 --- a/services/idm/Makefile +++ b/services/idm/Makefile @@ -4,7 +4,6 @@ TAGS := disable_crypt include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/idp/Makefile b/services/idp/Makefile index 7134924161..60881b285d 100644 --- a/services/idp/Makefile +++ b/services/idp/Makefile @@ -3,7 +3,6 @@ NAME := idp include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/invitations/Makefile b/services/invitations/Makefile index f5e672a13f..315a4fe949 100644 --- a/services/invitations/Makefile +++ b/services/invitations/Makefile @@ -3,12 +3,11 @@ NAME := invitations include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) diff --git a/services/nats/Makefile b/services/nats/Makefile index b68c553062..3d8714b05d 100644 --- a/services/nats/Makefile +++ b/services/nats/Makefile @@ -3,7 +3,6 @@ NAME := nats include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 6cbadf4162..7896ab2f55 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -5,7 +5,6 @@ TEMPLATE_FILE = ./pkg/email/l10n/notifications.pot include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/ocdav/Makefile b/services/ocdav/Makefile index 6dd00a4088..49bbbd9628 100644 --- a/services/ocdav/Makefile +++ b/services/ocdav/Makefile @@ -3,7 +3,6 @@ NAME := ocdav include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/ocm/Makefile b/services/ocm/Makefile index 8f3bce8007..5fab56ee5e 100644 --- a/services/ocm/Makefile +++ b/services/ocm/Makefile @@ -3,7 +3,6 @@ NAME := ocm include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/ocs/Makefile b/services/ocs/Makefile index e543c2fa98..519b1f25ba 100644 --- a/services/ocs/Makefile +++ b/services/ocs/Makefile @@ -3,7 +3,6 @@ NAME := ocs include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/policies/Makefile b/services/policies/Makefile index f9295aa21c..6864e73336 100644 --- a/services/policies/Makefile +++ b/services/policies/Makefile @@ -3,7 +3,6 @@ NAME := policies include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/postprocessing/Makefile b/services/postprocessing/Makefile index 6346c66de5..28eb9b2df3 100644 --- a/services/postprocessing/Makefile +++ b/services/postprocessing/Makefile @@ -3,7 +3,6 @@ NAME := postprocessing include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/proxy/Makefile b/services/proxy/Makefile index 13fcad3404..f5432b6692 100644 --- a/services/proxy/Makefile +++ b/services/proxy/Makefile @@ -3,12 +3,11 @@ NAME := proxy include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) +.PHONY: go-generate +go-generate: $(MOCKERY) $(MOCKERY) diff --git a/services/search/Makefile b/services/search/Makefile index 0f1c3c58c9..13306a3475 100644 --- a/services/search/Makefile +++ b/services/search/Makefile @@ -3,13 +3,12 @@ NAME := search include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk -.PHONY: go-generate-prod -go-generate-prod: $(PIGEON) $(MOCKERY) +.PHONY: go-generate +go-generate: $(PIGEON) $(MOCKERY) $(MOCKERY) $(PIGEON) -optimize-grammar -optimize-parser -o ../../pkg/kql/dictionary_gen.go ../../pkg/kql/dictionary.peg diff --git a/services/settings/Makefile b/services/settings/Makefile index 77dcebb7e4..5959b99ac1 100644 --- a/services/settings/Makefile +++ b/services/settings/Makefile @@ -5,7 +5,6 @@ TEMPLATE_FILE = ./pkg/service/v0/l10n/settings.pot include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk @@ -15,8 +14,8 @@ include ../../.make/protobuf.mk .PHONY: docs-generate docs-generate: grpc-docs-generate -.PHONY: go-generate-prod -go-generate-prod: $(MOCKERY) protobuf +.PHONY: go-generate +go-generate: $(MOCKERY) protobuf $(MOCKERY) .PHONY: protobuf diff --git a/services/sharing/Makefile b/services/sharing/Makefile index fe5bce0065..1a45c80f80 100644 --- a/services/sharing/Makefile +++ b/services/sharing/Makefile @@ -3,7 +3,6 @@ NAME := sharing include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/sse/Makefile b/services/sse/Makefile index d71a1dc195..88cb6e3ee4 100644 --- a/services/sse/Makefile +++ b/services/sse/Makefile @@ -3,7 +3,6 @@ NAME := sse include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/storage-publiclink/Makefile b/services/storage-publiclink/Makefile index c4b9784169..6bfb5ac805 100644 --- a/services/storage-publiclink/Makefile +++ b/services/storage-publiclink/Makefile @@ -3,7 +3,6 @@ NAME := storage-publiclink include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/storage-shares/Makefile b/services/storage-shares/Makefile index bc0d5c8048..0fa3336d44 100644 --- a/services/storage-shares/Makefile +++ b/services/storage-shares/Makefile @@ -3,7 +3,6 @@ NAME := storage-shares include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/storage-system/Makefile b/services/storage-system/Makefile index 604c1bd159..1563091cad 100644 --- a/services/storage-system/Makefile +++ b/services/storage-system/Makefile @@ -3,7 +3,6 @@ NAME := storage-system include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/storage-users/Makefile b/services/storage-users/Makefile index 6d17ac71c8..9e58af03c9 100644 --- a/services/storage-users/Makefile +++ b/services/storage-users/Makefile @@ -3,7 +3,6 @@ NAME := storage-users include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/thumbnails/Makefile b/services/thumbnails/Makefile index bc9d40a3a6..26dfc76a27 100644 --- a/services/thumbnails/Makefile +++ b/services/thumbnails/Makefile @@ -3,15 +3,14 @@ NAME := thumbnails include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk include ../../.make/protobuf.mk -.PHONY: go-generate-prod -go-generate-prod: protobuf +.PHONY: go-generate +go-generate: protobuf .PHONY: protobuf protobuf: buf-generate diff --git a/services/userlog/Makefile b/services/userlog/Makefile index feb9b5b6b0..a02cc84e2e 100644 --- a/services/userlog/Makefile +++ b/services/userlog/Makefile @@ -5,7 +5,6 @@ TEMPLATE_FILE = ./pkg/service/l10n/userlog.pot include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/users/Makefile b/services/users/Makefile index 1f133efb97..0cd926390e 100644 --- a/services/users/Makefile +++ b/services/users/Makefile @@ -3,7 +3,6 @@ NAME := users include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/web/Makefile b/services/web/Makefile index 79912b9177..80d0059b3c 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -5,7 +5,6 @@ WEB_ASSETS_BRANCH = main include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/webdav/Makefile b/services/webdav/Makefile index 1cd7a05192..d41d65abd3 100644 --- a/services/webdav/Makefile +++ b/services/webdav/Makefile @@ -3,7 +3,6 @@ NAME := webdav include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk diff --git a/services/webfinger/Makefile b/services/webfinger/Makefile index df7f792087..15690e261e 100644 --- a/services/webfinger/Makefile +++ b/services/webfinger/Makefile @@ -3,7 +3,6 @@ NAME := webfinger include ../../.bingo/Variables.mk include ../../.make/default.mk -include ../../.make/deprecate.mk include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk