From cbef9630b4e8bcc3f34d52bf4d42c7e3d638f310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Fri, 29 Sep 2017 15:51:56 +0200 Subject: [PATCH] Updated makefiles from gsictl --- git.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/git.mk b/git.mk index 178cd98..dae0e82 100644 --- a/git.mk +++ b/git.mk @@ -4,19 +4,25 @@ commit: tag: git tag ${VERSION} -push:: +git-push:: git push --tags -u origin HEAD -pull:: +git-pull: git pull --all -push-github: ## Push the code to github. You need to set up HUB_USER and HUB_PASSWORD +push-github: ## Push the code to github. You need to set up GITHUB_DEPLOY_KEY +ifeq ($(GITHUB_DEPLOY_KEY),) +else $(eval KEY_FILE := $(shell mktemp)) - @echo "$$GITHUB_DEPLOY_KEY" > $(KEY_FILE) + @echo "$(GITHUB_DEPLOY_KEY)" > $(KEY_FILE) @git remote rm github-deploy || true git remote add github-deploy $(GITHUB_REPO) @GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git fetch github-deploy $(CI_COMMIT_REF_NAME) || true @GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git push github-deploy $(CI_COMMIT_REF_NAME) rm $(KEY_FILE) +endif -.PHONY:: commit tag push push-github +push:: git-push +pull:: git-pull + +.PHONY:: commit tag push git-push git-pull push-github