Skip to content

Commit

Permalink
disable install scripts and fix duplicate targets
Browse files Browse the repository at this point in the history
  • Loading branch information
wkloucek committed Nov 16, 2021
1 parent 33d9a11 commit 4747e8b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 12 deletions.
9 changes: 7 additions & 2 deletions .make/docs.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@

SKIP_CONFIG_DOCS_GENERATE ?= 0
CONFIG_DOCS_BASE_PATH ?= ../docs/extensions

.PHONY: config-docs-generate
config-docs-generate: $(FLAEX)
@echo "$(NAME): generating config docs"
@$(FLAEX) >| ../docs/extensions/$(NAME)/configuration.md
@if [ $(SKIP_CONFIG_DOCS_GENERATE) -eq 1 ]; then \
$(FLAEX) >| $(CONFIG_DOCS_BASE_PATH)/$(NAME)/configuration.md \
; fi;

.PHONY: grpc-docs-generate
grpc-docs-generate: buf-generate
2 changes: 1 addition & 1 deletion .make/l10n.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ OUTPUT_DIR = ./l10n
TEMPLATE_FILE = ./l10n/template.pot

# Name of the generated .po files for each available locale.
LOCALE_FILES = $(shell find l10n/locale -name '*.po')
LOCALE_FILES = $(shell find l10n/locale -name '*.po' 2> /dev/null)

.PHONY: l10n-push
l10n-push:
Expand Down
3 changes: 3 additions & 0 deletions accounts/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.1.0.cjs

enableScripts: false
enableTelemetry: false
3 changes: 3 additions & 0 deletions idp/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.1.0.cjs

enableScripts: false
enableTelemetry: false
6 changes: 2 additions & 4 deletions ocis-pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ include ../.make/go.mk
include ../.make/release.mk

############ docs generate ############
SKIP_CONFIG_DOCS_GENERATE = 1

include ../.make/docs.mk

.PHONY: docs-generate
docs-generate:

.PHONY: config-docs-generate
config-docs-generate:
@echo "ocis-pkg: nothing to do"

############ generate ############
include ../.make/generate.mk

Expand Down
7 changes: 2 additions & 5 deletions ocis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ include ../.make/go.mk
include ../.make/release.mk

############ docs generate ############
CONFIG_DOCS_BASE_PATH := ../docs

include ../.make/docs.mk

.PHONY: docs-generate
docs-generate: config-docs-generate

.PHONY: config-docs-generate
config-docs-generate: $(FLAEX)
@echo "$(NAME): generating config docs"
@$(FLAEX) >| ../docs/$(NAME)/configuration.md

############ dev-docker ############
.PHONY: dev-docker
dev-docker:
Expand Down

0 comments on commit 4747e8b

Please sign in to comment.