Fixed typo in .gitlab-ci

Squashed '.makefiles/' changes from 21ff551..b20982c
b20982c Merge branch 'senpy' into 'master' 8fe7616 Updated makefiles from senpy 1543f55 Updated makefiles from senpy f04cbee Testing new k8s mk git-subtree-dir: .makefiles git-subtree-split: b20982cae1
2025-09-16 11:32:21 +00:00 · 2017-10-03 17:19:14 +02:00 · 2017-10-03 17:16:27 +02:00 · 2017-10-03 17:13:57 +02:00 · 2017-10-03 17:05:24 +02:00 · 2017-10-03 16:41:04 +02:00
2 changed files with 5 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,11 +63,13 @@ push-github:
  only:
    - master
    - triggers
+    - fix-makefiles

 deploy_pypi:
  stage: deploy
  script:   # Configure the PyPI credentials, then push the package, and cleanup the creds.
    - echo "[server-login]" >> ~/.pypirc
+    - echo "repository=https://upload.pypi.org/legacy/" >> ~/.pypirc
    - echo "username=" ${PYPI_USER} >> ~/.pypirc
    - echo "password=" ${PYPI_PASSWORD} >> ~/.pypirc
    - make pip_upload
--- a/.makefiles/git.mk
+++ b/.makefiles/git.mk
@@ -13,12 +13,12 @@ git-pull:
 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))
+	$(eval KEY_FILE := "$(shell mktemp)")
 	@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)
+	-@GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git fetch github-deploy $(CI_COMMIT_REF_NAME)
+	@GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git push github-deploy HEAD:$(CI_COMMIT_REF_NAME)
 	rm $(KEY_FILE)
 endif
Author	SHA1	Message	Date
J. Fernando Sánchez	390225df45	Fixed typo in .gitlab-ci	2017-10-03 17:19:14 +02:00
J. Fernando Sánchez	b03e03fd0a	Squashed '.makefiles/' changes from 21ff551..b20982c `b20982c` Merge branch 'senpy' into 'master' `8fe7616` Updated makefiles from senpy `1543f55` Updated makefiles from senpy `f04cbee` Testing new k8s mk git-subtree-dir: .makefiles git-subtree-split: `b20982cae1`	2017-10-03 17:16:27 +02:00
J. Fernando Sánchez	79e107bdcd	Fixed mistake in .pypirc	2017-10-03 17:13:57 +02:00
J. Fernando Sánchez	c6e79fa50d	Changed pypi repository	2017-10-03 17:05:24 +02:00
J. Fernando Sánchez	f6bf7459a8	Added push to github in fix-makefiles	2017-10-03 16:41:04 +02:00
J. Fernando Sánchez	300f4c374a	Trying to fix push to github	2017-10-03 16:39:09 +02:00