Skip to content

Commit 7df7e93

Browse files
committed
fixup! fixup! make priority merges also skip Promote PRs
1 parent e5aa351 commit 7df7e93

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

tests/Spec.hs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6527,7 +6527,6 @@ main = hspec $ do
65276527
, Pause
65286528
, BuildStatusChanged (Sha "2bc") "default" Project.BuildSucceeded
65296529
, PullRequestCommitChanged (PullRequestId 2) (Sha "2bc") -- this leads to a `Promote` PR
6530-
65316530
, CommentAdded (PullRequestId 1) "deckard" Nothing "@bot merge with priority"
65326531
, BuildStatusChanged (Sha "1ab") "default" Project.BuildSucceeded
65336532
, PullRequestCommitChanged (PullRequestId 1) (Sha "1ab")
@@ -6546,19 +6545,19 @@ main = hspec $ do
65466545
`shouldBe` [ AIsReviewer "deckard"
65476546
, ALeaveComment (PullRequestId 2) "<!-- Hoff: ignore -->\nPull request approved for merge by @deckard, rebasing now."
65486547
, ATryIntegrate
6549-
"Merge #2: Second PR\n\n\
6550-
\Approved-by: deckard\n\
6551-
\Priority: Normal\n\
6552-
\Auto-deploy: false\n"
6553-
(PullRequestId 2, Branch "refs/pull/2/head", Sha "cd2")
6554-
[]
6555-
False
6556-
, ALeaveComment
6557-
(PullRequestId 2)
6558-
"<!-- Hoff: ignore -->\nRebased as 2bc, waiting for CI …"
6548+
"Merge #2: Second PR\n\n\
6549+
\Approved-by: deckard\n\
6550+
\Priority: Normal\n\
6551+
\Auto-deploy: false\n"
6552+
(PullRequestId 2, Branch "refs/pull/2/head", Sha "cd2")
6553+
[]
6554+
False
6555+
, ALeaveComment
6556+
(PullRequestId 2)
6557+
"<!-- Hoff: ignore -->\nRebased as 2bc, waiting for CI …"
65596558
, ATryForcePush (Branch "snd") (Sha "2bc")
65606559
, ALeaveComment (PullRequestId 2) "Your PR is ready to be merged into master, but merging has been paused"
6561-
, AIsReviewer "deckard"
6560+
, AIsReviewer "deckard"
65626561
, ALeaveComment
65636562
(PullRequestId 1)
65646563
"<!-- Hoff: ignore -->\nPull request approved for merge with high priority by @deckard, rebasing now."
@@ -6579,7 +6578,7 @@ main = hspec $ do
65796578
(PullRequestId 2, Branch "refs/pull/2/head", Sha "cd2")
65806579
[PullRequestId 1]
65816580
False
6582-
, ALeaveComment (PullRequestId 2) "<!-- Hoff: ignore -->\nSpeculatively rebased as 2de behind 1 other PR, waiting for CI …"
6581+
, ALeaveComment (PullRequestId 2) "<!-- Hoff: ignore -->\nSpeculatively rebased as 2de behind 1 other PR, waiting for CI …"
65836582
, ATryForcePush (Branch "fst") (Sha "1ab")
65846583
, ATryPromote (Sha "1ab")
65856584
, ACleanupTestBranch (PullRequestId 1)

0 commit comments

Comments
 (0)