Merge pull request #9178 from ruby/refine-release-task

Refine release task for the next patch release

Author: hsbt

.changelog.yml

@@ -24,10 +24,8 @@ changelog_label_mapping:
   "rubygems: skip changelog": null
 
 patch_level_labels:
-  - "rubygems: performance"
   - "rubygems: enhancement"
   - "rubygems: bug fix"
   - "rubygems: security"
-  - "rubygems: deprecation"
   - "rubygems: documentation"
   - "rubygems: skip changelog"

Rakefile

@@ -254,10 +254,16 @@ desc "Upload release to S3"
 task :upload_to_s3 do
   require "aws-sdk-s3"
 
-  s3 = Aws::S3::Resource.new(region:"us-west-2")
+  client = Aws::S3::Client.new(region: "us-west-2")
+  transfer_manager = Aws::S3::TransferManager.new(client: client)
+
   %w[zip tgz].each do |ext|
-    obj = s3.bucket("oregon.production.s3.rubygems.org").object("rubygems/rubygems-#{v}.#{ext}")
-    obj.upload_file("pkg/rubygems-#{v}.#{ext}", acl: "public-read")
+    transfer_manager.upload_file(
+      "pkg/rubygems-#{v}.#{ext}",
+      bucket: "oregon.production.s3.rubygems.org",
+      key: "rubygems/rubygems-#{v}.#{ext}",
+      acl: "public-read"
+    )
   end
 end
 
@@ -706,6 +712,8 @@ namespace :bundler do
     Rake::Task["bundler:build_metadata:clean"].tap(&:reenable).invoke
   end
 
+  task "build" => ["bundler:release:check_ruby_version"]
+
   desc "Push to rubygems.org"
   task "release:rubygem_push" => ["bundler:release:setup", "man:check", "bundler:build_metadata", "check_release_preparations", "bundler:release:github"]
 
@@ -726,5 +734,9 @@ namespace :bundler do
 
       Release.for_bundler(gemspec_version).create_for_github!
     end
+
+    task :check_ruby_version do
+      raise "bundler:build need to released Ruby for using nokogiri" if RUBY_PATCHLEVEL.to_i < 0
+    end
   end
 end

bundler/.changelog.yml

@@ -18,10 +18,8 @@ changelog_label_mapping:
   "bundler: skip changelog": null
 
 patch_level_labels:
-  - "bundler: performance"
   - "bundler: enhancement"
   - "bundler: bug fix"
   - "bundler: security"
-  - "bundler: deprecation"
   - "bundler: documentation"
   - "bundler: skip changelog"

tool/release.rb

@@ -144,10 +144,14 @@ def initialize(version)
     @previous_stable_branch = @level == :minor_or_major ? "#{segments[0]}.#{segments[1] - 1}" : @stable_branch
     @previous_stable_branch = "3.7" if @stable_branch == "4.0"
 
-    @previous_release_tag = if @level == :minor_or_major && !@prerelease
-      "v#{@previous_stable_branch}.0"
+    @previous_release_tag = if @level == :minor_or_major
+      if @prerelease
+        `git describe --tags --abbrev=0`.strip
+      else
+        "v#{@previous_stable_branch}.0"
+      end
     else
-      `git describe --tags --abbrev=0`.strip
+      "v#{@stable_branch}.0"
     end
 
     rubygems_version = segments.join(".").gsub(/([a-z])\.(\d)/i, '\1\2')