Skip to content

A platform for community discussion. Free, open, simple.

DEV: Stage security fixes in a predictable order (#43947)

David Tayloraf9ce557a6f4
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index 636885a12f4..2ea3b87daad 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -208,7 +208,7 @@ namespace :release do
capture: true,
)
- prs = JSON.parse(json_output)
+ prs = JSON.parse(json_output).sort_by { |pr| pr["number"] }
raise "No open PRs found targeting #{base} on private-mirror" if prs.empty?
extract_ghsa_id = ->(body) do
@@ -247,6 +247,7 @@ namespace :release do
)
end
raise "No PRs selected" if selected.empty?
+ selected.sort_by! { |pr| pr["number"] }
puts "Staging security fixes for #{base} branch: #{selected.map { |pr| pr["headRefName"] }.inspect}"
diff --git a/spec/tasks/release_spec.rb b/spec/tasks/release_spec.rb
index 3b115068aac..c4c51a95d40 100644
--- a/spec/tasks/release_spec.rb
+++ b/spec/tasks/release_spec.rb
@@ -476,13 +476,6 @@ RSpec.describe "tasks/release" do
end
let(:pr_list_json) do
[
- {
- "number" => 1,
- "title" => "Security fix one",
- "body" =>
- "Description for fix one\nhttps://github.com/discourse/discourse/security/advisories/GHSA-1111-2222-3333",
- "headRefName" => "security-fix-one",
- },
{
"number" => 2,
"title" => "Security fix two",
@@ -490,6 +483,13 @@ RSpec.describe "tasks/release" do
"https://github.com/discourse/discourse/security/advisories/GHSA-aaaa-bbbb-cccc",
"headRefName" => "security-fix-two",
},
+ {
+ "number" => 1,
+ "title" => "Security fix one",
+ "body" =>
+ "Description for fix one\nhttps://github.com/discourse/discourse/security/advisories/GHSA-1111-2222-3333",
+ "headRefName" => "security-fix-one",
+ },
].to_json
end