[CI] Refactors make.sh

- Only one task for both snapshot and release based on VERSION_QUALIFIER
- Checks if version needs to be updated
- Removed DATE qualifier from make.sh

Author: picandocodigo

.ci/make.sh

@@ -20,27 +20,16 @@ GITHUB_TOKEN=${GITHUB_TOKEN-nil}
 RUBYGEMS_API=${RUBYGEMS_API-nil}
 GIT_NAME=${GIT_NAME-elastic}
 GIT_EMAIL=${GIT_EMAIL-'clients-team@elastic.co'}
-DATE=`date +%Y%m%d%H%M%S`
-VERSION_QUALIFIER=${VERSION_QUALIFIER-$DATE}
+VERSION_QUALIFIER=${VERSION_QUALIFIER-''}
 
 case $CMD in
-    assemble_snapshot)
-        TASK=assemble_snapshot[$VERSION_QUALIFIER,$TARGET_DIR]
-        ;;
     assemble)
-        TASK=assemble_release[$TARGET_DIR]
-        ;;
-    publish)
-        TASK=publish
+        TASK=assemble[$VERSION_QUALIFIER,$TARGET_DIR]
         ;;
     *)
         echo -e "\nUsage:"
-        echo -e "\t Build snapshot gem files:"
-        echo -e "\t VERSION_QUALIFIER=alpha1 $0 assemble_snapshot\n"
-        echo -e "\t Build release gem files:"
-        echo -e "\t $0 assemble_snapshot\n"
-        echo -e "\t Publish gems:"
-        echo -e "\t $0 publish\n"
+        echo -e "\t Build gem files:"
+        echo -e "\t [VERSION_QUALIFIER=alpha1] $0 assemble\n"
         exit 1
 esac
 

rake_tasks/unified_release_tasks.rake

@@ -18,29 +18,11 @@
 require_relative '../elasticsearch/lib/elasticsearch/version'
 
 namespace :unified_release do
-  desc 'Build snapshot gem files'
-  task :assemble_snapshot, [:version_qualifier, :output_dir] do |_, args|
-    @version = if !(args[:version_qualifier].nil? || args[:version_qualifier].empty?)
-                 if Elasticsearch::VERSION.include?('SNAPSHOT')
-                   # eg 8.0.0-SNAPSHOT
-                   Elasticsearch::VERSION.gsub('-SNAPSHOT', ".#{args[:version_qualifier]}-SNAPSHOT")
-                 else
-                   Elasticsearch::VERSION + ".#{args[:version_qualifier]}"
-                 end
-               else
-                 Elasticsearch::VERSION
-               end
+  desc 'Build gem files'
+  task :assemble, [:version_qualifier, :output_dir] do |_, args|
+    @version = determine_version(args)
+    Rake::Task['update_version'].invoke(Elasticsearch::VERSION, @version) unless @version == Elasticsearch::VERSION
 
-    Rake::Task['update_version'].invoke(Elasticsearch::VERSION, @version)
-
-    build_gems(args[:output_dir])
-  end
-
-  desc 'Build release gem files'
-  task :assemble_release, [:output_dir] do |_, args|
-    raise ArgumentError, 'You must specify an output dir' unless args[:output_dir]
-
-    @version = Elasticsearch::VERSION
     build_gems(args[:output_dir])
   end
 
@@ -55,6 +37,19 @@ namespace :unified_release do
     puts '-' * 80
   end
 
+  def determine_version(args)
+    if !(args[:version_qualifier].nil? || args[:version_qualifier].empty?)
+      if Elasticsearch::VERSION.include?('SNAPSHOT')
+        # eg 8.0.0-SNAPSHOT
+        Elasticsearch::VERSION.gsub('-SNAPSHOT', ".#{args[:version_qualifier]}-SNAPSHOT")
+      else
+        Elasticsearch::VERSION + ".#{args[:version_qualifier]}"
+      end
+    else
+      Elasticsearch::VERSION
+    end
+  end
+
   desc 'Publish gems to Rubygems'
   task :publish do
     setup_credentials