build: update base SHA for rebase on merge-pr script · javascriptStudy111/angular@87a2366 · GitHub

javascriptStudy111 / angular Public

forked from angular/angular

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 87a2366

Browse filesBrowse the repository at this point in the historyBrowse files

jasonaden

committed

build: update base SHA for rebase on merge-pr script

1 parent 0f5da82 commit 87a2366
Copy full SHA for 87a2366

1 file changed

+2-2Lines changed: 2 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• scripts/github
  • merge-pr

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎scripts/github/merge-pr‎

Copy file name to clipboardExpand all lines: scripts/github/merge-pr

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -131,8 +131,8 @@ CHERRY_PICK_PR="git cherry-pick merge_pr_base..merge_pr"
131	131	#
132	132	# This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging
133	133	# 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
136	136	if [[ $MERGE_MASTER == 1 ]]; then
137	137	REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER"
138	138	# check patch only if patch-only PR

0 commit comments

Comments

0 (0)