balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 08:12:27 +00:00
Code Issues Releases Wiki Activity

Updated makefiles from gsictl

Browse Source
This commit is contained in:
J. Fernando Sánchez 2017-09-29 15:11:08 +02:00
parent 963211caf2
commit 53db670715
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base.mk
View File

@ -24,5 +24,6 @@ ci: ## Run a task using gitlab-runner. Only use to debug problems in the CI pip
gitlab-runner exec shell --builds-dir '.builds' --env CI_PROJECT_NAME=$(NAME) ${action} gitlab-runner exec shell --builds-dir '.builds' --env CI_PROJECT_NAME=$(NAME) ${action}
include $(MK_DIR)/makefiles.mk include $(MK_DIR)/makefiles.mk
include $(MK_DIR)/docker.mk
.PHONY:: config help ci version .FORCE .PHONY:: config help ci version .FORCE

10
docker.mk
View File

@ -1,6 +1,6 @@
IMAGEWTAG ?= $(IMAGENAME):$(VERSION) IMAGEWTAG ?= $(IMAGENAME):$(VERSION)
login: ## Log in to the registry. It will only be used in the server, or when running a CI task locally (if CI_BUILD_TOKEN is set). docker-login: ## Log in to the registry. It will only be used in the server, or when running a CI task locally (if CI_BUILD_TOKEN is set).
ifeq ($(CI_BUILD_TOKEN),) ifeq ($(CI_BUILD_TOKEN),)
@echo "Not logging in to the docker registry" "$(CI_REGISTRY)" @echo "Not logging in to the docker registry" "$(CI_REGISTRY)"
else else
@ -12,10 +12,14 @@ else
@docker login -u $(HUB_USER) -p $(HUB_PASSWORD) @docker login -u $(HUB_USER) -p $(HUB_PASSWORD)
endif endif
clean:: ## Remove docker credentials login:: docker-login
clean:: docker-clean ## Remove docker credentials
docker-clean:
ifeq ($(HUB_USER),) ifeq ($(HUB_USER),)
else else
@docker logout @docker logout
endif endif
.PHONY:: login clean .PHONY:: docker-login docker-clean login clean

11
git.mk
View File

@ -1,12 +1,15 @@
git_commit: commit:
git commit -a git commit -a
git_tag: tag:
git tag ${VERSION} git tag ${VERSION}
git_push: push::
git push --tags origin master git push --tags origin master
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 HUB_USER and HUB_PASSWORD
$(eval KEY_FILE := $(shell mktemp)) $(eval KEY_FILE := $(shell mktemp))
@echo "$$GITHUB_DEPLOY_KEY" > $(KEY_FILE) @echo "$$GITHUB_DEPLOY_KEY" > $(KEY_FILE)
@ -16,4 +19,4 @@ push-github: ## Push the code to github. You need to set up HUB_USER and HUB_PAS
@GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git push github-deploy $(CI_COMMIT_REF_NAME) @GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git push github-deploy $(CI_COMMIT_REF_NAME)
rm $(KEY_FILE) rm $(KEY_FILE)
.PHONY:: git_commit git_tag git_push push-github .PHONY:: commit tag push push-github

4
makefiles.mk
View File

@ -1,5 +1,5 @@
makefiles-remote: makefiles-remote:
git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git || true @git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git 2>/dev/null || true
makefiles-commit: makefiles-remote makefiles-commit: makefiles-remote
git add -f .makefiles git add -f .makefiles
@ -11,4 +11,6 @@ makefiles-push:
makefiles-pull: makefiles-remote makefiles-pull: makefiles-remote
git subtree pull --prefix=.makefiles/ makefiles master --squash git subtree pull --prefix=.makefiles/ makefiles master --squash
update:: makefiles-pull
.PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull .PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull