|
1 | | -require_relative 'lib/concurrent-ruby/concurrent/version' |
2 | | -require_relative 'lib/concurrent-ruby-edge/concurrent/edge/version' |
| 1 | +version = File.read("#{__dir__}/lib/concurrent-ruby/concurrent/version.rb")[/'(.+)'/, 1] or raise |
| 2 | +edge_version = File.read("#{__dir__}/lib/concurrent-ruby-edge/concurrent/edge/version.rb")[/'(.+)'/, 1] or raise |
3 | 3 | require_relative 'lib/concurrent-ruby/concurrent/utility/engine' |
4 | 4 |
|
5 | 5 | core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec') |
|
96 | 96 | task :installed do |
97 | 97 | Bundler.with_original_env do |
98 | 98 | Dir.chdir(__dir__) do |
99 | | - sh "gem install pkg/concurrent-ruby-#{Concurrent::VERSION}.gem" |
100 | | - sh "gem install pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem" if Concurrent.on_cruby? |
101 | | - sh "gem install pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" |
| 99 | + sh "gem install pkg/concurrent-ruby-#{version}.gem" |
| 100 | + sh "gem install pkg/concurrent-ruby-ext-#{version}.gem" if Concurrent.on_cruby? |
| 101 | + sh "gem install pkg/concurrent-ruby-edge-#{edge_version}.gem" |
102 | 102 | ENV['NO_PATH'] = 'true' |
103 | 103 | sh 'bundle update' |
104 | 104 | sh 'bundle exec rake spec:ci' |
@@ -128,7 +128,7 @@ rescue LoadError => e |
128 | 128 | puts 'RSpec is not installed, skipping test task definitions: ' + e.message |
129 | 129 | end |
130 | 130 |
|
131 | | -current_yard_version_name = Concurrent::VERSION |
| 131 | +current_yard_version_name = version |
132 | 132 |
|
133 | 133 | begin |
134 | 134 | require 'yard' |
@@ -314,21 +314,21 @@ namespace :release do |
314 | 314 | desc '** tag HEAD with current version and push to github' |
315 | 315 | task :tag => :ask do |
316 | 316 | Dir.chdir(__dir__) do |
317 | | - sh "git tag v#{Concurrent::VERSION}" if publish_base |
318 | | - sh "git push origin v#{Concurrent::VERSION}" if publish_base |
319 | | - sh "git tag edge-v#{Concurrent::EDGE_VERSION}" if publish_edge |
320 | | - sh "git push origin edge-v#{Concurrent::EDGE_VERSION}" if publish_edge |
| 317 | + sh "git tag v#{version}" if publish_base |
| 318 | + sh "git push origin v#{version}" if publish_base |
| 319 | + sh "git tag edge-v#{edge_version}" if publish_edge |
| 320 | + sh "git push origin edge-v#{edge_version}" if publish_edge |
321 | 321 | end |
322 | 322 | end |
323 | 323 |
|
324 | 324 | desc '** push all *.gem files to rubygems' |
325 | 325 | task :rubygems => :ask do |
326 | 326 | Dir.chdir(__dir__) do |
327 | | - sh "gem push pkg/concurrent-ruby-#{Concurrent::VERSION}.gem" if publish_base |
328 | | - sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" if publish_edge |
329 | | - sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem" if publish_base |
330 | | - sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x64-mingw32.gem" if publish_base |
331 | | - sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x86-mingw32.gem" if publish_base |
| 327 | + sh "gem push pkg/concurrent-ruby-#{version}.gem" if publish_base |
| 328 | + sh "gem push pkg/concurrent-ruby-edge-#{edge_version}.gem" if publish_edge |
| 329 | + sh "gem push pkg/concurrent-ruby-ext-#{version}.gem" if publish_base |
| 330 | + sh "gem push pkg/concurrent-ruby-ext-#{version}-x64-mingw32.gem" if publish_base |
| 331 | + sh "gem push pkg/concurrent-ruby-ext-#{version}-x86-mingw32.gem" if publish_base |
332 | 332 | end |
333 | 333 | end |
334 | 334 |
|
|
0 commit comments