mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:17:32 +00:00
dynamic login branch
This commit is contained in:
7
Makefile
7
Makefile
@@ -14,6 +14,7 @@ export GOCOVERDIR ZITADEL_MASTERKEY
|
|||||||
|
|
||||||
LOGIN_REMOTE_NAME := login
|
LOGIN_REMOTE_NAME := login
|
||||||
LOGIN_REMOTE_URL := https://github.com/zitadel/typescript.git
|
LOGIN_REMOTE_URL := https://github.com/zitadel/typescript.git
|
||||||
|
LOGIN_REMOTE_BRANCH ?= main
|
||||||
|
|
||||||
.PHONY: compile
|
.PHONY: compile
|
||||||
compile: core_build console_build compile_pipeline
|
compile: core_build console_build compile_pipeline
|
||||||
@@ -172,12 +173,14 @@ core_lint:
|
|||||||
.PHONY: login-pull
|
.PHONY: login-pull
|
||||||
login-pull: login-ensure-remote
|
login-pull: login-ensure-remote
|
||||||
git fetch $(LOGIN_REMOTE_NAME)
|
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
|
.PHONY: login-push
|
||||||
login-push: login-ensure-remote
|
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:
|
login-ensure-remote:
|
||||||
@git remote -v | grep $(LOGIN_REMOTE_NAME) || \
|
@git remote -v | grep $(LOGIN_REMOTE_NAME) || \
|
||||||
git remote add $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_URL)
|
git remote add $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_URL)
|
||||||
|
|
||||||
|
include login/Makefile
|
||||||
|
Reference in New Issue
Block a user