From 0d22de74ea069003b49a9d52878d5f1ac04d71bb Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 29 Nov 2018 14:49:31 -0500 Subject: [PATCH] Make sure the dev version prefix is based on the latest tag in the repo, not the latest tag on the master branch (part 2). No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- sdk/cli/arvados-cli.gemspec | 2 +- sdk/cwl/arvados_version.py | 6 +++--- sdk/cwl/gittaggers.py | 6 +++--- sdk/pam/arvados_version.py | 6 +++--- sdk/python/arvados_version.py | 6 +++--- sdk/python/gittaggers.py | 6 +++--- sdk/ruby/arvados.gemspec | 2 +- services/dockercleaner/arvados_version.py | 6 +++--- services/fuse/arvados_version.py | 6 +++--- services/login-sync/arvados-login-sync.gemspec | 2 +- services/nodemanager/arvados_version.py | 6 +++--- tools/crunchstat-summary/arvados_version.py | 6 +++--- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec index 723b516686..80abc9c497 100644 --- a/sdk/cli/arvados-cli.gemspec +++ b/sdk/cli/arvados-cli.gemspec @@ -7,7 +7,7 @@ if not File.exist?('/usr/bin/git') then exit end -git_latest_tag = `git describe --abbrev=0` +git_latest_tag = `git tag -l |sort -V -r |head -n1` git_latest_tag = git_latest_tag.encode('utf-8').strip git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":") git_timestamp = Time.at(git_timestamp.to_i).utc diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py index 88cf1ed7ca..c2a4d735fd 100644 --- a/sdk/cwl/arvados_version.py +++ b/sdk/cwl/arvados_version.py @@ -10,9 +10,9 @@ import re SETUP_DIR = os.path.dirname(__file__) or '.' def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def choose_version_from(): sdk_ts = subprocess.check_output( diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py index 8ccb6645de..873199d7e5 100644 --- a/sdk/cwl/gittaggers.py +++ b/sdk/cwl/gittaggers.py @@ -29,9 +29,9 @@ class EggInfoFromGit(egg_info): from source package), leave it alone. """ def git_latest_tag(self): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(self): gitinfo = subprocess.check_output( diff --git a/sdk/pam/arvados_version.py b/sdk/pam/arvados_version.py index a24d53dad6..3be72b51f0 100644 --- a/sdk/pam/arvados_version.py +++ b/sdk/pam/arvados_version.py @@ -8,9 +8,9 @@ import os import re def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(): gitinfo = subprocess.check_output( diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py index a24d53dad6..3be72b51f0 100644 --- a/sdk/python/arvados_version.py +++ b/sdk/python/arvados_version.py @@ -8,9 +8,9 @@ import os import re def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(): gitinfo = subprocess.check_output( diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py index ccf25c422e..213d39a24b 100644 --- a/sdk/python/gittaggers.py +++ b/sdk/python/gittaggers.py @@ -13,9 +13,9 @@ class EggInfoFromGit(egg_info): from source package), leave it alone. """ def git_latest_tag(self): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(self): gitinfo = subprocess.check_output( diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec index 609af6e23d..da919309f4 100644 --- a/sdk/ruby/arvados.gemspec +++ b/sdk/ruby/arvados.gemspec @@ -7,7 +7,7 @@ if not File.exist?('/usr/bin/git') then exit end -git_latest_tag = `git describe --abbrev=0` +git_latest_tag = `git tag -l |sort -V -r |head -n1` git_latest_tag = git_latest_tag.encode('utf-8').strip git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":") git_timestamp = Time.at(git_timestamp.to_i).utc diff --git a/services/dockercleaner/arvados_version.py b/services/dockercleaner/arvados_version.py index a24d53dad6..3be72b51f0 100644 --- a/services/dockercleaner/arvados_version.py +++ b/services/dockercleaner/arvados_version.py @@ -8,9 +8,9 @@ import os import re def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(): gitinfo = subprocess.check_output( diff --git a/services/fuse/arvados_version.py b/services/fuse/arvados_version.py index a24d53dad6..3be72b51f0 100644 --- a/services/fuse/arvados_version.py +++ b/services/fuse/arvados_version.py @@ -8,9 +8,9 @@ import os import re def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(): gitinfo = subprocess.check_output( diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec index f2c5735985..605e8540ee 100644 --- a/services/login-sync/arvados-login-sync.gemspec +++ b/services/login-sync/arvados-login-sync.gemspec @@ -7,7 +7,7 @@ if not File.exists?('/usr/bin/git') then exit end -git_latest_tag = `git describe --abbrev=0` +git_latest_tag = `git tag -l |sort -V -r |head -n1` git_latest_tag = git_latest_tag.encode('utf-8').strip git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":") git_timestamp = Time.at(git_timestamp.to_i).utc diff --git a/services/nodemanager/arvados_version.py b/services/nodemanager/arvados_version.py index a24d53dad6..3be72b51f0 100644 --- a/services/nodemanager/arvados_version.py +++ b/services/nodemanager/arvados_version.py @@ -8,9 +8,9 @@ import os import re def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(): gitinfo = subprocess.check_output( diff --git a/tools/crunchstat-summary/arvados_version.py b/tools/crunchstat-summary/arvados_version.py index a24d53dad6..3be72b51f0 100644 --- a/tools/crunchstat-summary/arvados_version.py +++ b/tools/crunchstat-summary/arvados_version.py @@ -8,9 +8,9 @@ import os import re def git_latest_tag(): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(): gitinfo = subprocess.check_output( -- 2.30.2