X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/81725af5d5d2e6cd18ba7099ba5fb1fc520f4f8c..0c98c5c9c5902a94dc614736a46b43fd43faba6e:/services/login-sync/arvados-login-sync.gemspec diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec index 2a91eed71c..8e338d2f2b 100644 --- a/services/login-sync/arvados-login-sync.gemspec +++ b/services/login-sync/arvados-login-sync.gemspec @@ -13,7 +13,12 @@ begin ENV["GIT_DIR"] = File.expand_path "#{__dir__}/../../.git" ENV["GIT_WORK_TREE"] = File.expand_path "#{__dir__}/../.." git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H #{__dir__}`.chomp.split(":") - version = `#{__dir__}/../../build/version-at-commit.sh #{git_hash}`.encode('utf-8').strip + if ENV["ARVADOS_BUILDING_VERSION"] + version = ENV["ARVADOS_BUILDING_VERSION"] + else + version = `#{__dir__}/../../build/version-at-commit.sh #{git_hash}`.encode('utf-8').strip + end + version = version.sub("~dev", ".dev").sub("~rc", ".rc") git_timestamp = Time.at(git_timestamp.to_i).utc ensure ENV["GIT_DIR"] = git_dir @@ -33,6 +38,7 @@ Gem::Specification.new do |s| s.executables << "arvados-login-sync" s.required_ruby_version = '>= 2.1.0' s.add_runtime_dependency 'arvados', '~> 1.3.0', '>= 1.3.0' + s.add_runtime_dependency 'launchy', '< 2.5' # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2 s.add_dependency('faraday', '< 0.16') # arvados-google-api-client (and thus arvados) gems