Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release promotion: Have images know their own released version #3802

Merged
merged 5 commits into from
Sep 17, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Makefiles: Fix dependencies around ambassador.version
Signed-off-by: Luke Shumaker <[email protected]>
LukeShu committed Sep 17, 2021
commit 8a2a8a69c6d5760035569257cd0db9779c6efe07
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -26,9 +26,7 @@ OSS_HOME := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
_git_remote_urls := $(shell git remote | xargs -n1 git remote get-url --all)
IS_PRIVATE ?= $(findstring private,$(_git_remote_urls))

images: python/ambassador.version
push: python/ambassador.version

include $(OSS_HOME)/build-aux/tools.mk
include $(OSS_HOME)/builder/builder.mk
include $(OSS_HOME)/_cxx/envoy.mk
include $(OSS_HOME)/charts/emissary-ingress/Makefile
5 changes: 2 additions & 3 deletions builder/builder.mk
Original file line number Diff line number Diff line change
@@ -235,9 +235,8 @@ raw-version:
@$(BUILDER) raw-version
.PHONY: raw-version

python/ambassador.version:
$(BUILDER) raw-version > python/ambassador.version
.PHONY: python/ambassador.version
python/ambassador.version: $(tools/write-ifchanged) FORCE
$(BUILDER) raw-version | $(tools/write-ifchanged) python/ambassador.version

compile: sync
@$(BUILDER) compile