mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 22:43:33 +08:00
DEV: Do not squash commits in version_bump:stage_security_fixes
(#23547)
Sometimes fixes will deliberately keep commits separate, and we don't want to undo that
This commit is contained in:
@ -213,7 +213,12 @@ RSpec.describe "tasks/version_bump" do
|
||||
Dir.chdir(origin_path) do
|
||||
# Check each fix has been added as a single commit, with the message matching the first commit on the branch
|
||||
expect(run("git", "log", "--pretty=%s", "main").lines.map(&:strip)).to eq(
|
||||
["security fix two", "security fix one, commit one", "Initial commit"],
|
||||
[
|
||||
"security fix two",
|
||||
"security fix one, commit two",
|
||||
"security fix one, commit one",
|
||||
"Initial commit",
|
||||
],
|
||||
)
|
||||
|
||||
# Check all the files from both fixes are present
|
||||
|
Reference in New Issue
Block a user