From da1963cfa4888837e75e9b25312f17ce1cba9f98 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Wed, 5 Mar 2025 16:44:29 +0100 Subject: [PATCH] enhancement: split make ci-node-generate and ci-go-generate into prod and dev stages --- .make/default.mk | 31 +++++++++ .make/deprecate.mk | 5 ++ .make/docs.mk | 2 - .make/generate.mk | 2 - .make/go.mk | 9 +-- Dockerfile | 4 +- Makefile | 70 ++++++++++++--------- opencloud/Makefile | 48 ++------------ opencloud/docker/Dockerfile.linux.multiarch | 2 +- pkg/Makefile | 36 ++--------- protogen/Makefile | 18 +++--- services/activitylog/Makefile | 39 +----------- services/antivirus/Makefile | 35 ++--------- services/app-provider/Makefile | 33 +--------- services/app-registry/Makefile | 33 +--------- services/audit/Makefile | 33 +--------- services/auth-app/Makefile | 33 +--------- services/auth-basic/Makefile | 33 +--------- services/auth-bearer/Makefile | 33 +--------- services/auth-machine/Makefile | 33 +--------- services/auth-service/Makefile | 33 +--------- services/clientlog/Makefile | 33 +--------- services/collaboration/Makefile | 35 ++--------- services/eventhistory/Makefile | 33 +--------- services/frontend/Makefile | 33 +--------- services/gateway/Makefile | 33 +--------- services/graph/Makefile | 41 ++---------- services/groups/Makefile | 33 +--------- services/idm/Makefile | 34 +--------- services/idp/Makefile | 29 ++------- services/invitations/Makefile | 34 ++-------- services/nats/Makefile | 33 +--------- services/notifications/Makefile | 39 +----------- services/ocdav/Makefile | 33 +--------- services/ocm/Makefile | 33 +--------- services/ocs/Makefile | 33 +--------- services/policies/Makefile | 33 +--------- services/postprocessing/Makefile | 33 +--------- services/proxy/Makefile | 34 ++-------- services/search/Makefile | 34 ++-------- services/settings/Makefile | 45 +++---------- services/sharing/Makefile | 33 +--------- services/sse/Makefile | 33 +--------- services/storage-publiclink/Makefile | 33 +--------- services/storage-shares/Makefile | 33 +--------- services/storage-system/Makefile | 33 +--------- services/storage-users/Makefile | 33 +--------- services/thumbnails/Makefile | 39 ++---------- services/userlog/Makefile | 39 +----------- services/users/Makefile | 33 +--------- services/web/Makefile | 31 +++------ services/webdav/Makefile | 33 +--------- services/webfinger/Makefile | 33 +--------- 53 files changed, 255 insertions(+), 1404 deletions(-) create mode 100644 .make/default.mk create mode 100644 .make/deprecate.mk delete mode 100644 .make/generate.mk diff --git a/.make/default.mk b/.make/default.mk new file mode 100644 index 0000000000..0f77250593 --- /dev/null +++ b/.make/default.mk @@ -0,0 +1,31 @@ +.PHONY: node-generate-dev-default +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: generate +generate: generate-prod # production is always the default + +.PHONY: generate-prod-default +generate-prod-default: node-generate-prod go-generate-prod + +.PHONY: generate-dev-default +generate-dev-default: node-generate-dev go-generate-dev + +.PHONY: vet +vet: noop + +.PHONY: noop +noop: + @echo -e "- $(MAKECMDGOALS): no action required\n" + +.PHONY: % +%: %-default + @ true diff --git a/.make/deprecate.mk b/.make/deprecate.mk new file mode 100644 index 0000000000..a86f85dbb5 --- /dev/null +++ b/.make/deprecate.mk @@ -0,0 +1,5 @@ +.PHONY: ci-node-generate +ci-node-generate: node-generate-prod + +.PHONY: ci-go-generate +ci-go-generate: go-generate-prod diff --git a/.make/docs.mk b/.make/docs.mk index 2b72d5be67..21bde3b8e8 100644 --- a/.make/docs.mk +++ b/.make/docs.mk @@ -1,5 +1,3 @@ - -SKIP_CONFIG_DOCS_GENERATE ?= 0 CONFIG_DOCS_BASE_PATH ?= ../../docs/services .PHONY: grpc-docs-generate diff --git a/.make/generate.mk b/.make/generate.mk deleted file mode 100644 index 1b8fc4034e..0000000000 --- a/.make/generate.mk +++ /dev/null @@ -1,2 +0,0 @@ -.PHONY: generate -generate: ci-node-generate ci-go-generate diff --git a/.make/go.mk b/.make/go.mk index a2cd190018..44f109ad49 100644 --- a/.make/go.mk +++ b/.make/go.mk @@ -53,17 +53,18 @@ sync: .PHONY: clean clean: - @echo "$(NAME): clean" - go clean -i ./... - rm -rf $(BIN) $(DIST) + @echo "- $(NAME): clean" + @go clean -i ./... + @rm -rf $(BIN) $(DIST) .PHONY: go-mod-tidy go-mod-tidy: - @echo "$(NAME): go-mod-tidy" + @echo "- $(NAME): go-mod-tidy" @go mod tidy .PHONY: fmt fmt: + @echo "- $(NAME): fmt" gofmt -s -w $(SOURCES) .PHONY: golangci-lint-fix diff --git a/Dockerfile b/Dockerfile index b2d2dbd10a..a79d3cab98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ FROM owncloudci/nodejs:18 AS generate COPY ./ /opencloud/ WORKDIR /opencloud/opencloud -RUN make ci-node-generate +RUN make node-generate-prod FROM golang:1.24-alpine AS build RUN apk add bash make git curl gcc musl-dev libc-dev binutils-gold inotify-tools vips-dev @@ -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 ci-go-generate build ENABLE_VIPS=true +RUN make go-generate-prod build ENABLE_VIPS=true FROM alpine:3.20 diff --git a/Makefile b/Makefile index bdac74aacd..f37b2c12a1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ SHELL := bash +include .make/deprecate.mk + # define standard colors BLACK := $(shell tput -Txterm setaf 0) RED := $(shell tput -Txterm setaf 1) @@ -142,15 +144,48 @@ composer.lock: composer.json @rm composer.lock || true .PHONY: generate -generate: +generate: generate-prod # production is always the default + +.PHONY: generate-prod +generate-prod: @for mod in $(OC_MODULES); do \ - $(MAKE) -C $$mod generate || exit 1; \ + printf '\n%s:\n---------------------------\n' $$mod; \ + $(MAKE) -C $$mod generate-prod || exit 1; \ done -.PHONY: vet -vet: +.PHONY: generate-dev +generate-dev: @for mod in $(OC_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod vet || exit 1; \ + printf '\n%s:\n---------------------------\n' $$mod; \ + $(MAKE) -C $$mod generate-dev || exit 1; \ + done + +.PHONY: go-generate-prod +go-generate-prod: + @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; \ + done + +.PHONY: node-generate-prod +node-generate-prod: + @for mod in $(OC_MODULES); do \ + printf '\n%s:\n---------------------------\n' $$mod; \ + $(MAKE) -C $$mod node-generate-prod || exit 1; \ + done + +.PHONY: node-generate-dev +node-generate-dev: + @for mod in $(OC_MODULES); do \ + printf '\n%s:\n---------------------------\n' $$mod; \ + $(MAKE) -C $$mod node-generate-dev || exit 1; \ done .PHONY: clean @@ -159,35 +194,10 @@ clean: $(MAKE) --no-print-directory -C $$mod clean || exit 1; \ done -.PHONY: docs-generate -docs-generate: - # empty the folders first to only have files that are generated without remnants - find docs/services/_includes/ -type f \( -name "*" ! -name ".git*" ! -name "_*" \) -delete || exit 1 - - @for mod in $(OC_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod docs-generate || exit 1; \ - done - - $(MAKE) --no-print-directory -C docs docs-generate || exit 1 - cp docs/services/general-info/env-var-deltas/*.adoc docs/services/_includes/adoc/env-var-deltas/ - .PHONY: check-env-var-annotations check-env-var-annotations: .make/check-env-var-annotations.sh -.PHONY: ci-go-generate -ci-go-generate: - @for mod in $(OC_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod ci-go-generate || exit 1; \ - done - -.PHONY: ci-node-generate -ci-node-generate: - @if [ $(MAKE_DEPTH) -le 1 ]; then \ - for mod in $(OC_MODULES); do \ - $(MAKE) --no-print-directory -C $$mod ci-node-generate || exit 1; \ - done; fi; - .PHONY: go-mod-tidy go-mod-tidy: @for mod in $(OC_MODULES); do \ diff --git a/opencloud/Makefile b/opencloud/Makefile index 618245459c..158d5ce069 100644 --- a/opencloud/Makefile +++ b/opencloud/Makefile @@ -1,45 +1,29 @@ SHELL := bash NAME := opencloud - TAGS := disable_crypt - +GOARCH := $(shell go env GOARCH) +CONFIG_DOCS_BASE_PATH := ../docs ifdef ENABLE_VIPS TAGS := ${TAGS},enable_vips endif -include ../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk -GOARCH := $(shell go env GOARCH) -endif - -############ go tooling ############ +include ../.make/default.mk +include ../.make/deprecate.mk +include ../.make/recursion.mk include ../.make/go.mk - -############ release ############ include ../.make/release.mk - -############ docs generate ############ -CONFIG_DOCS_BASE_PATH := ../docs - include ../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ dev-docker ############ .PHONY: dev-docker dev-docker: $(MAKE) --no-print-directory release-linux-docker-$(GOARCH) docker build -f docker/Dockerfile.linux.$(GOARCH) -t opencloudeu/opencloud:dev . -########### multiarch-docker ########### .PHONY: dev-docker-multiarch dev-docker-multiarch: @echo "+-------------------------------------------------------------------------+" - @echo "| Are you sure you have run make ci-node-generate in the repository root? |" + @echo "| Are you sure you have run make node-generate-prod in the repository root? |" @echo "+-------------------------------------------------------------------------+" sleep 10 docker buildx rm opencloudbuilder || true @@ -48,27 +32,7 @@ dev-docker-multiarch: cd .. && docker buildx build --platform linux/arm64,linux/amd64 --output type=docker --file opencloud/docker/Dockerfile.linux.multiarch --tag opencloud-eu/opencloud:dev-multiarch . docker buildx rm opencloudbuilder -############ debug-docker ############ .PHONY: debug-docker debug-docker: $(MAKE) --no-print-directory debug-linux-docker-$(GOARCH) docker build -f docker/Dockerfile.linux.debug.$(GOARCH) -t opencloud-eu/opencloud:debug . - -############ generate ############ -include ../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: # opencloud needs assets of all other modules - @if [ $(MAKE_DEPTH) -le 1 ]; then \ - $(MAKE) --no-print-directory -C .. ci-node-generate \ - ; fi; - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/opencloud/docker/Dockerfile.linux.multiarch b/opencloud/docker/Dockerfile.linux.multiarch index 0a4b77ab83..8d2b0d3ede 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 ci-go-generate ; \ + make go-generate-prod ; \ make -C opencloud release-linux-docker-${TARGETARCH} ENABLE_VIPS=true FROM alpine:3.20 diff --git a/pkg/Makefile b/pkg/Makefile index 43964cc93e..6363488624 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,40 +1,14 @@ SHELL := bash NAME := pkg -include ../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../.make/default.mk +include ../.make/deprecate.mk +include ../.make/recursion.mk include ../.make/go.mk - -############ release ############ include ../.make/release.mk - -############ docs generate ############ -SKIP_CONFIG_DOCS_GENERATE = 1 - include ../.make/docs.mk -.PHONY: docs-generate -docs-generate: - -############ generate ############ -include ../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: $(MOCKERY) # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) $(MOCKERY) - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/protogen/Makefile b/protogen/Makefile index 7f3ddab01c..16e81c69cc 100644 --- a/protogen/Makefile +++ b/protogen/Makefile @@ -1,16 +1,12 @@ -include ../.make/recursion.mk +SHELL := bash +NAME := protogen -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../.bingo/Variables.mk -endif - -############ generate ############ +include ../.make/default.mk +include ../.make/deprecate.mk +include ../.make/recursion.mk include ../.make/generate.mk -.PHONY: ci-node-generate -ci-node-generate: - -.PHONY: ci-go-generate -ci-go-generate: $(MOCKERY) # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) $(MOCKERY) diff --git a/services/activitylog/Makefile b/services/activitylog/Makefile index 6043c63934..dcadbb37db 100644 --- a/services/activitylog/Makefile +++ b/services/activitylog/Makefile @@ -1,39 +1,16 @@ SHELL := bash NAME := activitylog - -# Where to write the files generated by this makefile. OUTPUT_DIR = ./pkg/service/l10n TEMPLATE_FILE = ./pkg/service/l10n/activitylog.pot -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress "command not found warnings" for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ translations ######## .PHONY: l10n-pull l10n-pull: cd $(OUTPUT_DIR) && tx pull --all --force --skip --minimum-perc=75 @@ -46,16 +23,6 @@ l10n-push: l10n-read: $(GO_XGETTEXT) $(GO_XGETTEXT) -o $(OUTPUT_DIR)/activitylog.pot --keyword=l10n.Template -s pkg/service/response.go -.PHONY: l10n-write -l10n-write: - .PHONY: l10n-clean l10n-clean: rm -f $(TEMPLATE_FILE); - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/antivirus/Makefile b/services/antivirus/Makefile index 2220cb7c1c..15af56c16f 100644 --- a/services/antivirus/Makefile +++ b/services/antivirus/Makefile @@ -1,37 +1,14 @@ SHELL := bash NAME := antivirus -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) + $(MOCKERY) diff --git a/services/app-provider/Makefile b/services/app-provider/Makefile index eaf545ffa1..3054de6349 100644 --- a/services/app-provider/Makefile +++ b/services/app-provider/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := app-provider -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/app-registry/Makefile b/services/app-registry/Makefile index 95586b00ca..08c2be7915 100644 --- a/services/app-registry/Makefile +++ b/services/app-registry/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := app-registry -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/audit/Makefile b/services/audit/Makefile index 8813d06921..efba63fba3 100644 --- a/services/audit/Makefile +++ b/services/audit/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := audit -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/auth-app/Makefile b/services/auth-app/Makefile index 3898eb98c8..df4db7c26c 100644 --- a/services/auth-app/Makefile +++ b/services/auth-app/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := auth-app -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/auth-basic/Makefile b/services/auth-basic/Makefile index 8335c0531c..b61194756f 100644 --- a/services/auth-basic/Makefile +++ b/services/auth-basic/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := auth-basic -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/auth-bearer/Makefile b/services/auth-bearer/Makefile index d778d8c835..e3ae235211 100644 --- a/services/auth-bearer/Makefile +++ b/services/auth-bearer/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := auth-bearer -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/auth-machine/Makefile b/services/auth-machine/Makefile index 66bf34f0a3..1963016e21 100644 --- a/services/auth-machine/Makefile +++ b/services/auth-machine/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := auth-machine -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/auth-service/Makefile b/services/auth-service/Makefile index bab3eec589..c50670d1ea 100644 --- a/services/auth-service/Makefile +++ b/services/auth-service/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := auth-service -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/clientlog/Makefile b/services/clientlog/Makefile index 7559c8e8ff..3f97dcd916 100644 --- a/services/clientlog/Makefile +++ b/services/clientlog/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := clientlog -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/collaboration/Makefile b/services/collaboration/Makefile index 2b960a7f14..b3586724b9 100644 --- a/services/collaboration/Makefile +++ b/services/collaboration/Makefile @@ -1,37 +1,14 @@ SHELL := bash NAME := collaboration -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) + $(MOCKERY) diff --git a/services/eventhistory/Makefile b/services/eventhistory/Makefile index 067ddff4e8..c0ed54ce56 100644 --- a/services/eventhistory/Makefile +++ b/services/eventhistory/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := eventhistory -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/frontend/Makefile b/services/frontend/Makefile index b818323b17..c6ce1182fe 100644 --- a/services/frontend/Makefile +++ b/services/frontend/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := frontend -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/gateway/Makefile b/services/gateway/Makefile index 240f960782..f683f01dad 100644 --- a/services/gateway/Makefile +++ b/services/gateway/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := gateway -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/graph/Makefile b/services/graph/Makefile index 4295c26d53..6ffc4cc022 100644 --- a/services/graph/Makefile +++ b/services/graph/Makefile @@ -1,40 +1,20 @@ SHELL := bash NAME := graph - -# Where to write the files generated by this makefile. OUTPUT_DIR = ./pkg/l10n TEMPLATE_FILE = ./pkg/l10n/graph.pot -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: $(MOCKERY) # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) $(MOCKERY) -.PHONY: ci-node-generate -ci-node-generate: - -############ translations ######## .PHONY: l10n-pull l10n-pull: cd $(OUTPUT_DIR) && tx pull --all --force --skip --minimum-perc=75 @@ -47,17 +27,6 @@ l10n-push: l10n-read: $(GO_XGETTEXT) $(GO_XGETTEXT) -o $(OUTPUT_DIR)/graph.pot --keyword=l10n.Template --add-comments -s pkg/service/v0/spacetemplates.go -s pkg/unifiedrole/roles.go -.PHONY: l10n-write -l10n-write: - .PHONY: l10n-clean l10n-clean: rm -f $(TEMPLATE_FILE); - - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/groups/Makefile b/services/groups/Makefile index 952dc2023c..721fb9d7c9 100644 --- a/services/groups/Makefile +++ b/services/groups/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := groups -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/idm/Makefile b/services/idm/Makefile index 0919e6831f..2876a43abc 100644 --- a/services/idm/Makefile +++ b/services/idm/Makefile @@ -1,39 +1,11 @@ SHELL := bash NAME := idm - TAGS := disable_crypt -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/idp/Makefile b/services/idp/Makefile index e3f4d94dcd..7134924161 100644 --- a/services/idp/Makefile +++ b/services/idp/Makefile @@ -1,33 +1,16 @@ SHELL := bash NAME := idp -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: assets +.PHONY: node-generate-prod +node-generate-prod: assets .PHONY: assets assets: pnpm-build \ @@ -35,7 +18,6 @@ assets: pnpm-build \ assets/identifier/static/favicon.ico \ assets/identifier/static/icon-lilac.svg - assets/identifier/static: mkdir -p assets/identifier/static @@ -57,7 +39,6 @@ pnpm-build: node_modules node_modules: pnpm install -############ licenses ############ .PHONY: ci-node-check-licenses ci-node-check-licenses: node_modules pnpm licenses:check diff --git a/services/invitations/Makefile b/services/invitations/Makefile index ceb8ad3fff..f5e672a13f 100644 --- a/services/invitations/Makefile +++ b/services/invitations/Makefile @@ -1,38 +1,14 @@ SHELL := bash NAME := invitations -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: $(MOCKERY) # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) $(MOCKERY) - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/nats/Makefile b/services/nats/Makefile index e08c864838..b68c553062 100644 --- a/services/nats/Makefile +++ b/services/nats/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := nats -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 098294abe2..6cbadf4162 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -1,39 +1,16 @@ SHELL := bash NAME := notifications - -# Where to write the files generated by this makefile. OUTPUT_DIR = ./pkg/email/l10n TEMPLATE_FILE = ./pkg/email/l10n/notifications.pot -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ translations ######## .PHONY: l10n-pull l10n-pull: cd $(OUTPUT_DIR) && tx pull --all --force --skip --minimum-perc=75 @@ -46,16 +23,6 @@ l10n-push: l10n-read: $(GO_XGETTEXT) $(GO_XGETTEXT) -o $(OUTPUT_DIR)/notifications.pot --keyword=l10n.Template --add-comments -s pkg/email/templates.go -.PHONY: l10n-write -l10n-write: - .PHONY: l10n-clean l10n-clean: rm -f $(TEMPLATE_FILE); - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/ocdav/Makefile b/services/ocdav/Makefile index 6a0849d288..6dd00a4088 100644 --- a/services/ocdav/Makefile +++ b/services/ocdav/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := ocdav -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/ocm/Makefile b/services/ocm/Makefile index c53bbee766..8f3bce8007 100644 --- a/services/ocm/Makefile +++ b/services/ocm/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := ocm -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/ocs/Makefile b/services/ocs/Makefile index f739a4d226..e543c2fa98 100644 --- a/services/ocs/Makefile +++ b/services/ocs/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := ocs -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/policies/Makefile b/services/policies/Makefile index 2af5897614..f9295aa21c 100644 --- a/services/policies/Makefile +++ b/services/policies/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := policies -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/postprocessing/Makefile b/services/postprocessing/Makefile index 0bdc115722..6346c66de5 100644 --- a/services/postprocessing/Makefile +++ b/services/postprocessing/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := postprocessing -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/proxy/Makefile b/services/proxy/Makefile index 7aa5c0a96e..13fcad3404 100644 --- a/services/proxy/Makefile +++ b/services/proxy/Makefile @@ -1,38 +1,14 @@ SHELL := bash NAME := proxy -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: $(MOCKERY) # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) $(MOCKERY) - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/search/Makefile b/services/search/Makefile index e82428ace5..0f1c3c58c9 100644 --- a/services/search/Makefile +++ b/services/search/Makefile @@ -1,39 +1,15 @@ SHELL := bash NAME := search -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: $(PIGEON) $(MOCKERY) # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(PIGEON) $(MOCKERY) $(MOCKERY) $(PIGEON) -optimize-grammar -optimize-parser -o ../../pkg/kql/dictionary_gen.go ../../pkg/kql/dictionary.peg - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/settings/Makefile b/services/settings/Makefile index ef1fd71e51..77dcebb7e4 100644 --- a/services/settings/Makefile +++ b/services/settings/Makefile @@ -1,56 +1,28 @@ SHELL := bash NAME := settings - -# Where to write the files generated by this makefile. OUTPUT_DIR = ./pkg/service/v0/l10n TEMPLATE_FILE = ./pkg/service/v0/l10n/settings.pot -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk +include ../../.make/protobuf.mk .PHONY: docs-generate -docs-generate: config-docs-generate \ - grpc-docs-generate +docs-generate: grpc-docs-generate -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: $(MOCKERY) protobuf # CI runs ci-node-generate automatically before this target +.PHONY: go-generate-prod +go-generate-prod: $(MOCKERY) protobuf $(MOCKERY) -.PHONY: ci-node-generate -ci-node-generate: - -############ protobuf ############ -include ../../.make/protobuf.mk - .PHONY: protobuf protobuf: buf-generate $(PROTOC_GO_INJECT_TAG) cd ../../protogen/gen/ && $(PROTOC_GO_INJECT_TAG) -input="opencloud/messages/settings/v0/*.pb.go" -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: - -############ translations ######## .PHONY: l10n-pull l10n-pull: cd $(OUTPUT_DIR) && tx pull --all --force --skip --minimum-perc=75 @@ -65,9 +37,6 @@ l10n-read: $(GO_XGETTEXT) --keyword=l10n.Template --add-comments -s \ pkg/store/defaults/templates.go -.PHONY: l10n-write -l10n-write: - .PHONY: l10n-clean l10n-clean: rm -f $(TEMPLATE_FILE); diff --git a/services/sharing/Makefile b/services/sharing/Makefile index b264915fc0..fe5bce0065 100644 --- a/services/sharing/Makefile +++ b/services/sharing/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := sharing -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/sse/Makefile b/services/sse/Makefile index 5381f8cfaf..d71a1dc195 100644 --- a/services/sse/Makefile +++ b/services/sse/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := sse -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/storage-publiclink/Makefile b/services/storage-publiclink/Makefile index 32f5f3b239..c4b9784169 100644 --- a/services/storage-publiclink/Makefile +++ b/services/storage-publiclink/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := storage-publiclink -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/storage-shares/Makefile b/services/storage-shares/Makefile index fb62e2c67d..bc0d5c8048 100644 --- a/services/storage-shares/Makefile +++ b/services/storage-shares/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := storage-shares -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/storage-system/Makefile b/services/storage-system/Makefile index b7a331a539..604c1bd159 100644 --- a/services/storage-system/Makefile +++ b/services/storage-system/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := storage-system -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/storage-users/Makefile b/services/storage-users/Makefile index d96b83590a..6d17ac71c8 100644 --- a/services/storage-users/Makefile +++ b/services/storage-users/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := storage-users -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/thumbnails/Makefile b/services/thumbnails/Makefile index c95d59f9ae..bc9d40a3a6 100644 --- a/services/thumbnails/Makefile +++ b/services/thumbnails/Makefile @@ -1,44 +1,17 @@ SHELL := bash NAME := thumbnails -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ######### include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate \ - grpc-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ protobuf ############ include ../../.make/protobuf.mk +.PHONY: go-generate-prod +go-generate-prod: protobuf + .PHONY: protobuf protobuf: buf-generate - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/userlog/Makefile b/services/userlog/Makefile index 5d7f66ee47..feb9b5b6b0 100644 --- a/services/userlog/Makefile +++ b/services/userlog/Makefile @@ -1,39 +1,16 @@ SHELL := bash NAME := userlog - -# Where to write the files generated by this makefile. OUTPUT_DIR = ./pkg/service/l10n TEMPLATE_FILE = ./pkg/service/l10n/userlog.pot -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ translations ######## .PHONY: l10n-pull l10n-pull: cd $(OUTPUT_DIR) && tx pull --all --force --skip --minimum-perc=75 @@ -46,16 +23,6 @@ l10n-push: l10n-read: $(GO_XGETTEXT) $(GO_XGETTEXT) -o $(OUTPUT_DIR)/userlog.pot --keyword=l10n.Template -s pkg/service/templates.go -.PHONY: l10n-write -l10n-write: - .PHONY: l10n-clean l10n-clean: rm -f $(TEMPLATE_FILE); - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/users/Makefile b/services/users/Makefile index 5c8db862a1..1f133efb97 100644 --- a/services/users/Makefile +++ b/services/users/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := users -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/web/Makefile b/services/web/Makefile index 6346818c98..301c5c7b93 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -3,33 +3,20 @@ NAME := web WEB_ASSETS_VERSION = v1.0.0 WEB_ASSETS_BRANCH = main -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ######### include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk -.PHONY: docs-generate -docs-generate: config-docs-generate +.PHONY: node-generate-dev +node-generate-dev: pull-assets -############ generate ############ -include ../../.make/generate.mk +.PHONY: node-generate-prod +node-generate-prod: download-assets -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: download-assets .PHONY: pull-assets pull-assets: @@ -57,10 +44,6 @@ download-assets: git clean -xfd assets curl --fail -slL -o- https://github.com/opencloud-eu/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/core/ -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: # OpenCloud Web does the check on it's own - .PHONY: ci-node-save-licenses ci-node-save-licenses: @mkdir -p ../../third-party-licenses/node/web diff --git a/services/webdav/Makefile b/services/webdav/Makefile index 7a570b955f..1cd7a05192 100644 --- a/services/webdav/Makefile +++ b/services/webdav/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := webdav -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ######### include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: diff --git a/services/webfinger/Makefile b/services/webfinger/Makefile index 3dc5d2f01f..df7f792087 100644 --- a/services/webfinger/Makefile +++ b/services/webfinger/Makefile @@ -1,37 +1,10 @@ SHELL := bash NAME := webfinger -include ../../.make/recursion.mk - -############ tooling ############ -ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI include ../../.bingo/Variables.mk -endif - -############ go tooling ############ +include ../../.make/default.mk +include ../../.make/deprecate.mk +include ../../.make/recursion.mk include ../../.make/go.mk - -############ release ############ include ../../.make/release.mk - -############ docs generate ############ include ../../.make/docs.mk - -.PHONY: docs-generate -docs-generate: config-docs-generate - -############ generate ############ -include ../../.make/generate.mk - -.PHONY: ci-go-generate -ci-go-generate: # CI runs ci-node-generate automatically before this target - -.PHONY: ci-node-generate -ci-node-generate: - -############ licenses ############ -.PHONY: ci-node-check-licenses -ci-node-check-licenses: - -.PHONY: ci-node-save-licenses -ci-node-save-licenses: