better docs-yaml build: Move yaml.mk in to main.mk and release.mk

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
emissary-ingress · Apr 19, 2022 · e849c03 · e849c03
1 parent d7112ff
commit e849c03
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -65,8 +65,6 @@ $(call module,ambassador,$(OSS_HOME))
 include $(OSS_HOME)/build-aux/generate.mk
 include $(OSS_HOME)/build-aux/lint.mk
 
-include $(OSS_HOME)/docs/yaml.mk
-
 .git/hooks/prepare-commit-msg:
 	ln -s $(OSS_HOME)/tools/hooks/prepare-commit-msg $(OSS_HOME)/.git/hooks/prepare-commit-msg
 

diff --git a/build-aux/main.mk b/build-aux/main.mk
@@ -146,3 +146,17 @@ endif
 	    fi; \
 	    sed -e 's/\$$version\$$/$*/g' -e 's,\$$imageRepo\$$,'"$${registry}"'/emissary,g' <$(src) >$(dst); \
 	  }$(NL)))
+
+build-output/docs-yaml-%: $(shell find docs/yaml)
+ifeq ($(CI),)
+	rm -rf $@
+else
+	@if test -d $@; then \
+	  echo 'This should not happen in CI: $@ should not need to change' >&2; \
+	  echo 'Files triggering the change are: $?' >&2; \
+	  exit 1; \
+	fi
+endif
+	$(foreach src,$(filter %.yaml,$^),$(foreach dst,$(patsubst docs/yaml/%,$@/%,$(src)),\
+	  mkdir -p $(dir $(dst))$(NL)\
+	  sed -e 's/\$$version\$$/$*/g' -e 's/\$$quoteVersion$$/0.4.1/g' <$(src) >$(dst)$(NL)))
diff --git a/docs/yaml.mk b/docs/yaml.mk
diff --git a/releng/release.mk b/releng/release.mk
@@ -58,3 +58,12 @@ else
 	manifests/push_manifests.sh $<
 endif
 .PHONY: push-manifests
+
+publish-docs-yaml: build-output/docs-yaml-$(patsubst v%,%,$(VERSION))
+ifneq ($(IS_PRIVATE),)
+	@echo "Private repo, not pushing chart" >&2
+	@exit 1
+else
+	docs/publish_yaml_s3.sh $<
+endif
+.PHONY: publish-docs-yaml