13339: fix git_hash variable

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index b73612f85a4e5b74602e46edbf22734382685b69..fd48b4852df4f1223eb7ce6fc125fc2234e78f6d 100644 (file)
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -9,7 +9,7 @@ end
 
 git_latest_tag = `git describe --abbrev=0`
 git_latest_tag = git_latest_tag.encode('utf-8').strip
-git_timestamp = `git log -n1 --first-parent --format=%ct`
+git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
 git_timestamp = Time.at(git_timestamp.to_i).utc
 
 Gem::Specification.new do |s|

diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index cd9b5ddaba9fdf5cbeb2dec86f4723bbf3269e56..e39c4263177b8ed4f290c17cb744c309725c56bc 100644 (file)
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -9,7 +9,7 @@ end
 
 git_latest_tag = `git describe --abbrev=0`
 git_latest_tag = git_latest_tag.encode('utf-8').strip
-git_timestamp = `git log -n1 --first-parent --format=%ct`
+git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
 git_timestamp = Time.at(git_timestamp.to_i).utc
 
 Gem::Specification.new do |s|

diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index 3ff498e6d870a6d4789dbda99399f8e5072281fa..4fb31a742e91ea76372f6fa8986748dde7414d21 100644 (file)
--- a/services/login-sync/arvados-login-sync.gemspec
+++ b/services/login-sync/arvados-login-sync.gemspec
@@ -9,7 +9,7 @@ end
 
 git_latest_tag = `git describe --abbrev=0`
 git_latest_tag = git_latest_tag.encode('utf-8').strip
-git_timestamp = `git log -n1 --first-parent --format=%ct`
+git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
 git_timestamp = Time.at(git_timestamp.to_i).utc
 
 Gem::Specification.new do |s|