From 1e7acf844ba04cb4abf02737ee8bebb2ecce6012 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sat, 22 Jul 2017 17:49:40 +0200 Subject: Add task to verify a release. Basically revises the release flow to: * Update the version in RAILS_VERSION + rake changelog:header * Run rake all:verify (click around in the booted app) * If that checks out, run rake release. --- tasks/release.rb | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'tasks') diff --git a/tasks/release.rb b/tasks/release.rb index 038fdc584a..ae16e6b80c 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -142,7 +142,7 @@ namespace :all do task push: FRAMEWORKS.map { |f| "#{f}:push" } + ["rails:push"] task :ensure_clean_state do - unless `git status -s | grep -v 'RAILS_VERSION\\|CHANGELOG\\|Gemfile.lock\\|package.json\\|version.rb'`.strip.empty? + unless `git status -s | grep -v 'RAILS_VERSION\\|CHANGELOG\\|Gemfile.lock\\|package.json\\|version.rb\\|tasks/release.rb'`.strip.empty? abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed" end @@ -152,6 +152,27 @@ namespace :all do end end + task verify: :install do + app_name = "pkg/verify-#{version}-#{Time.now.to_i}" + sh "rails new #{app_name}" + cd app_name + sh "rails generate scaffold user name admin:boolean && rails db:migrate" + + puts "Booting a Rails server. Verify the release by:" + puts + puts "- Seeing the correct release number on the root page" + puts "- Viewing /users" + puts "- Creating a user" + puts "- Updating a user (e.g. disable the admin flag)" + puts "- Deleting a user on /users" + puts "- Whatever else you want." + begin + sh "rails server" + rescue Interrupt + # Server passes along interrupt. Prevent halting verify task. + end + end + task :bundle do sh "bundle check" end -- cgit v1.2.3 From 973c3211c609f50031afdec43b885529abffb4c6 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sat, 22 Jul 2017 19:10:17 +0200 Subject: Support multiple versions in release announcement. So releasing 5.1 and 5.0 together won't require manual copy and paste. --- tasks/release.rb | 80 +++++++++++++----------------------- tasks/release_announcement_draft.erb | 38 +++++++++++++++++ 2 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 tasks/release_announcement_draft.erb (limited to 'tasks') diff --git a/tasks/release.rb b/tasks/release.rb index ae16e6b80c..ac13612b91 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -200,69 +200,47 @@ namespace :all do task release: %w(prep_release tag push) end -task :announce do - Dir.chdir("pkg/") do - if gem_version.segments[2] == 0 || gem_version.segments[3].is_a?(Integer) - # Not major releases, and not security releases - raise "Only valid for patch releases" +module Announcement + class Version + def initialize(version) + @version, @gem_version = version, Gem::Version.new(version) end - sums = "$ shasum -a 256 *-#{version}.gem\n" + `shasum -a 256 *-#{version}.gem` + def to_s + @version + end - puts "Hi everyone," - puts + def previous + @gem_version.segments[0, 3].tap { |v| v[2] -= 1 }.join(".") + end - puts "I am happy to announce that Rails #{version} has been released." - puts + def major_or_security? + @gem_version.segments[2].zero? || @gem_version.segments[3].is_a?(Integer) + end + + def rc? + @version =~ /rc/ + end + end +end + +task :announce do + Dir.chdir("pkg/") do + versions = ENV["VERSIONS"] ? ENV["VERSIONS"].split(",") : [ version ] + versions = versions.sort.map { |v| Announcement::Version.new(v) } - previous_version = gem_version.segments[0, 3] - previous_version[2] -= 1 - previous_version = previous_version.join(".") + raise "Only valid for patch releases" if versions.any?(&:major_or_security?) - if version =~ /rc/ + if versions.any?(&:rc?) require "date" future_date = Date.today + 5 future_date += 1 while future_date.saturday? || future_date.sunday? github_user = `git config github.user`.chomp - - puts <").result(binding) end end diff --git a/tasks/release_announcement_draft.erb b/tasks/release_announcement_draft.erb new file mode 100644 index 0000000000..65d121fd4b --- /dev/null +++ b/tasks/release_announcement_draft.erb @@ -0,0 +1,38 @@ +Hi everyone, + +I am happy to announce that Rails <%= versions.join(" and ") %> <%= versions.size > 1 ? "have" : "has" %> been released. + +<% if future_date %> +If no regressions are found, expect the final release on <%= future_date.strftime("%A, %B %-d, %Y") %>. +If you find one, please open an [issue on GitHub](https://github.com/rails/rails/issues/new) +<%= "and mention me (@github_user}) on it, " unless github_user.empty? %>so that we can fix it before the final release. +<% end %> +<% versions.each do |version| %> + +## CHANGES since <%= version.previous %> + +To view the changes for each gem, please read the changelogs on GitHub: + <% FRAMEWORKS.sort.each do |framework| %> +<%= "* [#{FRAMEWORK_NAMES[framework]} CHANGELOG](https://github.com/rails/rails/blob/v#{version}/#{framework}/CHANGELOG.md)" %> + <% end %> + +*Full listing* + +To see the full list of changes, [check out all the commits on +GitHub](https://github.com/rails/rails/compare/v<%= "#{version.previous}...v#{version}" %>). + <% end %> +## SHA-256 + +If you'd like to verify that your gem is the same as the one I've uploaded, +please use these SHA-256 hashes. + +<% versions.each do |version| %> +Here are the checksums for <%= version %>: + +``` +$ shasum -a 256 *-<%= version %>.gem +<%= `shasum -a 256 *-#{version}.gem` %> +``` + +<% end %> +As always, huge thanks to the many contributors who helped with this release. -- cgit v1.2.3 From 6f9b01c056cd2f3a4761baf78df207e1154f1b06 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Tue, 25 Jul 2017 21:58:33 +0200 Subject: Use exact Rails version when verifying. --- tasks/release.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tasks') diff --git a/tasks/release.rb b/tasks/release.rb index ac13612b91..b3bbbb0076 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -154,8 +154,13 @@ namespace :all do task verify: :install do app_name = "pkg/verify-#{version}-#{Time.now.to_i}" - sh "rails new #{app_name}" + sh "rails _#{version}_ new #{app_name} --skip-bundle" # Generate with the right version. cd app_name + + # Replace the generated gemfile entry with the exact version. + File.write("Gemfile", File.read("Gemfile").sub(/^gem 'rails.*/, "gem 'rails', '#{version}'")) + sh "bundle" + sh "rails generate scaffold user name admin:boolean && rails db:migrate" puts "Booting a Rails server. Verify the release by:" -- cgit v1.2.3 From 3636d1f4794ad510569441e8bfe4025288fe1c18 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sun, 30 Jul 2017 16:04:39 +0200 Subject: Fix github user output. [ Orhan Toy & Kasper Timm Hansen ] --- tasks/release_announcement_draft.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks') diff --git a/tasks/release_announcement_draft.erb b/tasks/release_announcement_draft.erb index 65d121fd4b..3dbb8c053f 100644 --- a/tasks/release_announcement_draft.erb +++ b/tasks/release_announcement_draft.erb @@ -5,7 +5,7 @@ I am happy to announce that Rails <%= versions.join(" and ") %> <%= versions.siz <% if future_date %> If no regressions are found, expect the final release on <%= future_date.strftime("%A, %B %-d, %Y") %>. If you find one, please open an [issue on GitHub](https://github.com/rails/rails/issues/new) -<%= "and mention me (@github_user}) on it, " unless github_user.empty? %>so that we can fix it before the final release. +<%= "and mention me (@#{github_user}) on it, " unless github_user.empty? %>so that we can fix it before the final release. <% end %> <% versions.each do |version| %> -- cgit v1.2.3