From 5c4842c33069b4b908ecfe4b25185424d052a197 Mon Sep 17 00:00:00 2001 From: Fernando Monserrat Date: Thu, 12 Apr 2018 15:37:46 -0300 Subject: [PATCH] 13339: fix git_hash variable Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat --- sdk/cli/arvados-cli.gemspec | 2 +- sdk/ruby/arvados.gemspec | 2 +- services/login-sync/arvados-login-sync.gemspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec index b73612f85a..fd48b4852d 100644 --- 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 cd9b5ddaba..e39c426317 100644 --- 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 3ff498e6d8..4fb31a742e 100644 --- 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| -- 2.30.2