diff --git a/docs/release-notes/release-notes-0.14.0.md b/docs/release-notes/release-notes-0.14.0.md index b1e2e163..151eb875 100644 --- a/docs/release-notes/release-notes-0.14.0.md +++ b/docs/release-notes/release-notes-0.14.0.md @@ -4,8 +4,9 @@ [A new pre-submit check has been added](https://github.com/lightningnetwork/lnd/pull/5520) to ensure that all -PRs add an entry in the release notes folder that at leasts links to PR being -added. +PRs ([aside from merge +commits](https://github.com/lightningnetwork/lnd/pull/5543)) add an entry in +the release notes folder that at leasts links to PR being added. # Code Health diff --git a/scripts/check-release-notes.sh b/scripts/check-release-notes.sh index 75d471cf..37a18e6f 100755 --- a/scripts/check-release-notes.sh +++ b/scripts/check-release-notes.sh @@ -6,6 +6,13 @@ set -e # format of the string stored in the variable is: refs/pull/:PRNUMBER/merge. 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 + exit 0 +fi + # Ensure that the PR number at least shows up in the release notes folder under # one of the contained milestones. if ! grep -r -q "lightningnetwork/lnd/pull/$PR_NUMBER" docs/release-notes; then