From 87589e994aada7edbd436da6936c9acade73d9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Mon, 27 Feb 2017 12:14:39 +0100 Subject: [PATCH] Fixed version.sh --- .gitlab-ci.yml | 4 ---- Makefile | 9 +++++++-- version.sh | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bfe306..224c02a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,10 +38,6 @@ test-3.5: <<: *test_definition image: "python:3.5" -test-3.4: - <<: *test_definition - image: "python:3.4" - test-2.7: <<: *test_definition image: "python:2.7" diff --git a/Makefile b/Makefile index 7b6076b..ebe0e93 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ FORCE: version: FORCE @echo $(VERSION) > $(NAME)/VERSION - @echo $(NAME) $(VERSION) + @echo $(VERSION) yapf: 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 rmi $(NAME)-debug 2>/dev/null || true -upload_git: + +git_commit: git commit -a + +git_tag: git tag ${VERSION} + +upload_git: git push --tags origin master pip_upload: diff --git a/version.sh b/version.sh index c8d1f03..48fcd04 100755 --- a/version.sh +++ b/version.sh @@ -1,2 +1,2 @@ #!/bin/sh -VERSION=$(git describe --long --tags --dirty) +git describe --long --tags --dirty