Skip to content

Commit 87a2366

Browse files
committed
build: update base SHA for rebase on merge-pr script
1 parent 0f5da82 commit 87a2366

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/github/merge-pr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ CHERRY_PICK_PR="git cherry-pick merge_pr_base..merge_pr"
131131
#
132132
# This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging
133133
# of non-approved or otherwise bad changes.
134-
REQUIRED_BASE_SHA_MASTER="3fba6eff79a9b50909199eaa4ebf754c1c4adba6" # pullapprove => CODEOWNERS migration
135-
REQUIRED_BASE_SHA_PATCH="e3853e842ea5c10fafbc310a76a4a7f47ed8c65e" # pullapprove => CODEOWNERS migration
134+
REQUIRED_BASE_SHA_MASTER="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration
135+
REQUIRED_BASE_SHA_PATCH="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration
136136
if [[ $MERGE_MASTER == 1 ]]; then
137137
REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER"
138138
# check patch only if patch-only PR

0 commit comments

Comments
 (0)