Skip to content

Commit acdbc09

Browse files
committed
[CI] Make version instance variable in assemble task
1 parent a4bf322 commit acdbc09

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

rake_tasks/unified_release_tasks.rake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# KIND, either express or implied. See the License for the
1717
# specific language governing permissions and limitations
1818
require_relative '../elasticsearch/lib/elasticsearch/version'
19-
CURRENT_VERSION = Elasticsearch::VERSION
2019

2120
namespace :unified_release do
2221
desc 'Build snapshot gem files'
@@ -27,14 +26,14 @@ namespace :unified_release do
2726
args[:version_qualifier]
2827
end
2928

30-
version = if CURRENT_VERSION.include?('SNAPSHOT')
31-
# eg 8.0.0-SNAPSHOT
32-
CURRENT_VERSION.gsub('-SNAPSHOT', "#{version_qualifier}-SNAPSHOT")
33-
else
34-
CURRENT_VERSION + "-#{version_qualifier}"
35-
end
29+
@version = if Elasticsearch::VERSION.include?('SNAPSHOT')
30+
# eg 8.0.0-SNAPSHOT
31+
Elasticsearch::VERSION.gsub('-SNAPSHOT', "#{version_qualifier}-SNAPSHOT")
32+
else
33+
Elasticsearch::VERSION + "-#{version_qualifier}"
34+
end
3635

37-
Rake::Task['update_version'].invoke(CURRENT_VERSION, version)
36+
Rake::Task['update_version'].invoke(Elasticsearch::VERSION, @version)
3837

3938
build_gems(args[:output_dir])
4039
end
@@ -43,13 +42,14 @@ namespace :unified_release do
4342
task :assemble_release, [:output_dir] do |_, args|
4443
raise ArgumentError, 'You must specify an output dir: rake build[output_dir]' unless args[:output_dir]
4544

45+
@version = Elasticsearch::VERSION
4646
build_gems(args[:output_dir])
4747
end
4848

4949
def build_gems(output_dir)
5050
RELEASE_TOGETHER.each do |gem|
5151
puts '-' * 80
52-
puts "Building #{gem} v#{CURRENT_VERSION} to #{output_dir}"
52+
puts "Building #{gem} v#{@version} to #{output_dir}"
5353
sh "cd #{CURRENT_PATH.join(gem)} && gem build --silent && mv *.gem #{CURRENT_PATH.join(output_dir)}"
5454
end
5555
puts '-' * 80
@@ -61,7 +61,7 @@ namespace :unified_release do
6161

6262
RELEASE_TOGETHER.each do |gem|
6363
puts '-' * 80
64-
puts "Releasing #{gem} v#{CURRENT_VERSION}"
64+
puts "Releasing #{gem} v#{Elasticsearch::VERSION}"
6565
sh "cd #{CURRENT_PATH.join(gem)} && bundle exec rake release"
6666
end
6767
end

0 commit comments

Comments
 (0)