Merge pull request #18007 from simaishi/update_gemfile_for_tag

Lock Gemfile to tag reference for release builds

(cherry picked from commit e0d7468)

lib/tasks/release.rake

@@ -20,11 +20,23 @@ task :release do
   version_file = root.join("VERSION")
   File.write(version_file, version)
 
-  # Create the commit and tag
-  exit $?.exitstatus unless system("git add #{version_file}")
+  # Change git based gem source to tag reference in Gemfile
+  gemfile = root.join("Gemfile")
+  content = gemfile.read
+  gemfile.write(content.gsub(":branch => \"#{branch}\"", ":tag => \"#{version}\""))
+
+  # Commit
+  exit $?.exitstatus unless system("git add #{version_file} #{gemfile}")
   exit $?.exitstatus unless system("git commit -m 'Release #{version}'")
+
+  # Tag
   exit $?.exitstatus unless system("git tag #{version}")
 
+  # Revert the Gemfile update
+  gemfile.write(content)
+  exit $?.exitstatus unless system("git add #{gemfile}")
+  exit $?.exitstatus unless system("git commit -m 'Revert Gemfile tag reference update and put back branch reference'")
+
   puts
   puts "The commit on #{branch} with the tag #{version} has been created"
   puts "Run the following to push to the upstream remote:"