fix: remove deprecations and use go-generate instead of go-generate-STAGE

2025-12-16 17:45:39 -06:00 · 2025-03-06 11:38:55 +01:00
parent 5fb225a61b
commit dbafbaa333
50 changed files with 29 additions and 91 deletions
--- 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
--- a/.make/deprecate.mk
+++ b/.make/deprecate.mk
@@ -1,5 +0,0 @@
-.PHONY: ci-node-generate
-ci-node-generate: node-generate-prod
-
-.PHONY: ci-go-generate
-ci-go-generate: go-generate-prod
--- a/2
+++ b/2
@@ -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

--- a/15
+++ b/15
@@ -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
--- 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
--- 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
--- 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)
--- 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)
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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