diff --git a/Makefile b/Makefile index 241c62c132..39ec3251d6 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ export GOCOVERDIR ZITADEL_MASTERKEY LOGIN_REMOTE_NAME := login LOGIN_REMOTE_URL := https://github.com/zitadel/typescript.git +LOGIN_REMOTE_BRANCH ?= main .PHONY: compile compile: core_build console_build compile_pipeline @@ -172,12 +173,14 @@ core_lint: .PHONY: login-pull login-pull: login-ensure-remote git fetch $(LOGIN_REMOTE_NAME) - git subtree pull --prefix=login $(LOGIN_REMOTE_NAME) main + git subtree pull --prefix=login $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_BRANCH) .PHONY: login-push login-push: login-ensure-remote - git subtree push --prefix=login $(LOGIN_REMOTE_NAME) main --squash + git subtree push --prefix=login $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_BRANCH) --squash login-ensure-remote: @git remote -v | grep $(LOGIN_REMOTE_NAME) || \ git remote add $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_URL) + +include login/Makefile