balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-24 09:02:28 +00:00
Code Issues Releases Wiki Activity

Fixed version.sh

Browse Source
This commit is contained in:
J. Fernando Sánchez 2017-02-27 12:14:39 +01:00
parent 9f6a6f5ecd
commit 87589e994a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -38,10 +38,6 @@ test-3.5:
<<: *test_definition <<: *test_definition
image: "python:3.5" image: "python:3.5"
test-3.4:
<<: *test_definition
image: "python:3.4"
test-2.7: test-2.7:
<<: *test_definition <<: *test_definition
image: "python:2.7" image: "python:2.7"

9
Makefile
View File

@ -13,7 +13,7 @@ FORCE:
version: FORCE version: FORCE
@echo $(VERSION) > $(NAME)/VERSION @echo $(VERSION) > $(NAME)/VERSION
@echo $(NAME) $(VERSION) @echo $(VERSION)
yapf: yapf:
yapf -i -r senpy yapf -i -r senpy
@ -79,9 +79,14 @@ clean:
@docker images | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1":"$$2;}}' | xargs docker rmi 2>/dev/null|| true @docker images | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1":"$$2;}}' | xargs docker rmi 2>/dev/null|| true
@docker rmi $(NAME)-debug 2>/dev/null || true @docker rmi $(NAME)-debug 2>/dev/null || true
upload_git:
git_commit:
git commit -a git commit -a
git_tag:
git tag ${VERSION} git tag ${VERSION}
upload_git:
git push --tags origin master git push --tags origin master
pip_upload: pip_upload:

2
version.sh
View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
VERSION=$(git describe --long --tags --dirty) git describe --long --tags --dirty