Skip to content

Commit f4c1b29

Browse files
committed
[CI] Adds version qualifier to task to build release and snapshot
1 parent 7427f0b commit f4c1b29

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

.ci/make.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,21 @@ GIT_NAME=${GIT_NAME-elastic}
2222
GIT_EMAIL=${GIT_EMAIL-'clients-team@elastic.co'}
2323

2424
case $CMD in
25+
assemble_snapshot)
26+
TASK=assemble_snapshot[$VERSION_QUALIFIER]
27+
;;
2528
assemble)
26-
TASK=build["$TARGET_DIR"]
29+
TASK=assemble_release[$TARGET_DIR]
2730
;;
2831
publish)
2932
TASK=publish
3033
;;
3134
*)
3235
echo -e "\nUsage:"
33-
echo -e "\t Build gem files:"
34-
echo -e "\t $0 assemble\n"
36+
echo -e "\t Build snapshot gem files:"
37+
echo -e "\t VERSION_QUALIFIER=alpha1 $0 assemble_snapshot\n"
38+
echo -e "\t Build release gem files:"
39+
echo -e "\t $0 assemble_snapshot\n"
3540
echo -e "\t Publish gems:"
3641
echo -e "\t $0 publish\n"
3742
exit 1

.dockerignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.git/
2-
31
.yardoc
42
coverage/
53
docs/

rake_tasks/unified_release_tasks.rake

+14-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,24 @@ require_relative '../elasticsearch/lib/elasticsearch/version'
1919
CURRENT_VERSION = Elasticsearch::VERSION
2020

2121
namespace :unified_release do
22-
desc 'Bump versions'
23-
task :bump, [:version] do |_, args|
24-
raise ArgumentError, 'You must specify a version: rake bump[8.0.0]' unless args[:version]
22+
desc 'Build snapshot gem files'
23+
task :assemble_snapshot, [:version_qualifier, :output_dir] do |_, args|
24+
raise ArgumentError,
25+
'You must specify a version_qualifier: e.g. rake bump[alpha1]' unless args[:version_qualifier]
2526

26-
Rake::Task['update_version'].invoke(CURRENT_VERSION, args[:version])
27+
version = if CURRENT_VERSION.include?('SNAPSHOT')
28+
# eg 8.0.0-SNAPSHOT
29+
CURRENT_VERSION.gsub('-SNAPSHOT', "#{args[:version_qualifier]}-SNAPSHOT")
30+
else
31+
CURRENT_VERSION + "-#{args[:version_qualifier]}"
32+
end
33+
34+
Rake::Task['update_version'].invoke(CURRENT_VERSION, version)
35+
Rake::Task['unified_release:assemble_release'].invoke(args[:output_dir])
2736
end
2837

2938
desc 'Build release gem files'
30-
task :build, [:output_dir] do |_, args|
39+
task :assemble_release, [:output_dir] do |_, args|
3140
raise ArgumentError, 'You must specify an output dir: rake build[output_dir]' unless args[:output_dir]
3241

3342
RELEASE_TOGETHER.each do |gem|

0 commit comments

Comments
 (0)