diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml index 0fe3ce4..07ba824 100644 --- a/gitlab-ci/deploy.yml +++ b/gitlab-ci/deploy.yml @@ -8,7 +8,7 @@ deploy: - if: $CI_COMMIT_TAG before_script: - pip install ansible --quiet - - git clone https://git.fudiggity.nl/sonny/newsreader.git deployment + - git clone https://git.fudiggity.nl/sonny/ansible-playbooks.git deployment - mkdir /root/.ssh - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key diff --git a/src/newsreader/conf/version.py b/src/newsreader/conf/version.py index d91d770..f8b4c8d 100644 --- a/src/newsreader/conf/version.py +++ b/src/newsreader/conf/version.py @@ -7,7 +7,9 @@ def get_current_version(): return os.environ["VERSION"] try: - output = subprocess.check_output(["git", "describe"], universal_newlines=True) + output = subprocess.check_output( + ["git", "describe", "--tags"], universal_newlines=True + ) return output.strip() except (subprocess.CalledProcessError, OSError): return ""