From 87a2366eeba64530e8a4293b773b56575b1a42e7 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 21 May 2019 17:07:19 -0700 Subject: [PATCH] build: update base SHA for rebase on merge-pr script --- scripts/github/merge-pr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/github/merge-pr b/scripts/github/merge-pr index 1bd4ba756c..4ad7a09aa1 100755 --- a/scripts/github/merge-pr +++ b/scripts/github/merge-pr @@ -131,8 +131,8 @@ CHERRY_PICK_PR="git cherry-pick merge_pr_base..merge_pr" # # This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging # of non-approved or otherwise bad changes. -REQUIRED_BASE_SHA_MASTER="3fba6eff79a9b50909199eaa4ebf754c1c4adba6" # pullapprove => CODEOWNERS migration -REQUIRED_BASE_SHA_PATCH="e3853e842ea5c10fafbc310a76a4a7f47ed8c65e" # pullapprove => CODEOWNERS migration +REQUIRED_BASE_SHA_MASTER="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration +REQUIRED_BASE_SHA_PATCH="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration if [[ $MERGE_MASTER == 1 ]]; then REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER" # check patch only if patch-only PR