From f42b6a39494f3c6e40a5d3d5ae9e13f9e9762b56 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 15 Jun 2023 17:47:58 -0500 Subject: [PATCH] scripts: update release notes check for merge queue usage Without this commit, PRs can fail to be merged via the merge queue, as it'll fail with this error: ``` Run scripts/check-release-notes.sh PR gh-readonly-queue didn't update release notes Error: Process completed with exit code 1. ``` --- scripts/check-release-notes.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/check-release-notes.sh b/scripts/check-release-notes.sh index 37a18e6fc..f88e3d67f 100755 --- a/scripts/check-release-notes.sh +++ b/scripts/check-release-notes.sh @@ -8,8 +8,10 @@ PR_NUMBER=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }') # If this is a PR being merged into the main repo, then the PR number will # actually be "master" here, so we'll ignore this case, and assume that in -# order for it to be merged it had to pass the check in its base branch. -if [ $PR_NUMBER == "master" ]; then +# order for it to be merged it had to pass the check in its base branch. If +# we're trying to merge this with the Merge Queue, then the PR number will be +# "gh-readonly-queue" instead. +if [ $PR_NUMBER == "master" ] || [ $PR_NUMBER == "gh-readonly-queue"]; then exit 0 fi