Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ let releaseAdvance (tag: string) (args: string list) =
if gate.Phase <> "ready-to-advance" && not (gate.Phase = "comments-require-review" && hasFlag "--review-comments-addressed" args) then
continuation tag gate
fail $"Release PR #{number} is not ready to advance: {gate.Phase}."
gh [ "pr"; "merge"; string number; "--merge"; "--delete-branch" ] |> requireSuccess "Merge release PR" |> ignore
gh [ "pr"; "merge"; string number; "--merge" ] |> requireSuccess "Merge release PR" |> ignore
let mainRoot = findMainWorktree ()
cleanWorktree mainRoot
runIn mainRoot "git" [ "fetch"; "origin"; "main"; "--prune" ] |> requireSuccess "Fetch main" |> ignore
Expand Down
2 changes: 1 addition & 1 deletion scripts/repo-maintenance/repo-maintenance.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ let releaseAdvance (tag: string) (args: string list) =
if gate.Phase <> "ready-to-advance" && not (gate.Phase = "comments-require-review" && hasFlag "--review-comments-addressed" args) then
continuation tag gate
fail $"Release PR #{number} is not ready to advance: {gate.Phase}."
gh [ "pr"; "merge"; string number; "--merge"; "--delete-branch" ] |> requireSuccess "Merge release PR" |> ignore
gh [ "pr"; "merge"; string number; "--merge" ] |> requireSuccess "Merge release PR" |> ignore
let mainRoot = findMainWorktree ()
cleanWorktree mainRoot
runIn mainRoot "git" [ "fetch"; "origin"; "main"; "--prune" ] |> requireSuccess "Fetch main" |> ignore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ let releaseAdvance (tag: string) (args: string list) =
if gate.Phase <> "ready-to-advance" && not (gate.Phase = "comments-require-review" && hasFlag "--review-comments-addressed" args) then
continuation tag gate
fail $"Release PR #{number} is not ready to advance: {gate.Phase}."
gh [ "pr"; "merge"; string number; "--merge"; "--delete-branch" ] |> requireSuccess "Merge release PR" |> ignore
gh [ "pr"; "merge"; string number; "--merge" ] |> requireSuccess "Merge release PR" |> ignore
let mainRoot = findMainWorktree ()
cleanWorktree mainRoot
runIn mainRoot "git" [ "fetch"; "origin"; "main"; "--prune" ] |> requireSuccess "Fetch main" |> ignore
Expand Down
Loading