honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update `REQUIRED_BASE_SHA` in merge script to `commit-message` script update commit (#36750) 

Updating `REQUIRED_BASE_SHA` for master and patch branches to make sure PRs that we merge are rebased after `commit-message` validation script update (to make sure the `lint` CI job fails in case a PR contains commits with invalid commit messages).

PR Close #36750
This commit is contained in:
Andrew Kushnir 2020-04-21 15:14:17 -07:00 committed by Matias Niemelä
parent 942b986ef3
commit 535c249f3a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/github/merge-pr
View File

@ -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 # 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. # of non-approved or otherwise bad changes.
REQUIRED_BASE_SHA_MASTER="c5c57f673745e9b66a771c49e778a7d2e8d8c56a" # clang 1.4.0 update REQUIRED_BASE_SHA_MASTER="4341743b4a6d7e23c6f944aa9e34166b701369a1" # `commit-message` script update
REQUIRED_BASE_SHA_PATCH="f4681b6e407c0f518bc4a27ca04ca60d8eff8a69" # clang 1.4.0 update REQUIRED_BASE_SHA_PATCH="2a53f471592f424538802907aca1f60f1177a86d" # `commit-message` script update
if [[ $MERGE_MASTER == 1 ]]; then if [[ $MERGE_MASTER == 1 ]]; then
REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER" REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER"
# check patch only if patch-only PR # check patch only if patch-only PR