Skip to content

Commit 4e2978c

Browse files
committed
[CI] Updates assemble task, SNAPSHOT
1 parent 639fdfb commit 4e2978c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.ci/make.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ args_string="${args_string// /,}"
131131

132132
docker run \
133133
--env "RUBY_TEST_VERSION=${RUBY_TEST_VERSION}" \
134+
--env "WORKFLOW=${WORKFLOW}" \
134135
--name test-runner \
135136
--volume "${REPO_BINDING}" \
136137
--volume "${repo}:/usr/src/app" \

rake_tasks/unified_release_tasks.rake

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ require_relative '../elasticsearch/lib/elasticsearch/version'
2121
namespace :unified_release do
2222
desc 'Build gem releases and snapshots'
2323
task :assemble, [:version, :output_dir] do |_, args|
24-
@version = if ENV['WORKFLOW'] == 'snapshot'
25-
"#{args[:version]}.#{Time.now.strftime('%Y%m%d%H%M%S')}-SNAPSHOT"
26-
else
27-
args[:version]
28-
end
29-
Rake::Task['update_version'].invoke(Elasticsearch::VERSION, @version) unless @version == Elasticsearch::VERSION
30-
@zip_filename = "elasticsearch-ruby-#{@version}"
24+
if ENV['WORKFLOW'] == 'snapshot'
25+
@zip_filename = "elasticsearch-ruby-#{args[:version]}-SNAPSHOT"
26+
@version = "#{args[:version]}.#{Time.now.strftime('%Y%m%d%H%M%S')}-SNAPSHOT"
27+
else
28+
@version = args[:version]
29+
@zip_filename = "elasticsearch-ruby-#{@version}"
30+
end
31+
3132
Rake::Task['unified_release:bump'].invoke(@version) unless @version == Elasticsearch::VERSION
3233
build_gems(args[:output_dir])
3334
create_zip_file(args[:output_dir])

0 commit comments

Comments
 (0)