diff --git a/.github/workflows/lint-release-proposal.yml b/.github/workflows/lint-release-proposal.yml index 88bbd5d4e9b068..101fa9964f0c73 100644 --- a/.github/workflows/lint-release-proposal.yml +++ b/.github/workflows/lint-release-proposal.yml @@ -39,7 +39,7 @@ jobs: EXPECTED_TRAILER="^$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/[[:digit:]]+\$" echo "Expected trailer format: $EXPECTED_TRAILER" PR_URL="$(git --no-pager log -1 --format='%(trailers:key=PR-URL,valueonly)')" - echo "Actual: $ACTUAL" + echo "Actual: $PR_URL" echo "$PR_URL" | grep -E -q "$EXPECTED_TRAILER" PR_HEAD="$(gh pr view "$PR_URL" --json headRefOid -q .headRefOid)" diff --git a/tools/actions/lint-release-proposal-commit-list.mjs b/tools/actions/lint-release-proposal-commit-list.mjs index b6ec7213bafc0a..b5104a6503e489 100755 --- a/tools/actions/lint-release-proposal-commit-list.mjs +++ b/tools/actions/lint-release-proposal-commit-list.mjs @@ -34,6 +34,7 @@ if (commitListingStart === -1) { // Normalize for consistent comparison commitList = commitList .replaceAll('**(SEMVER-MINOR)** ', '') + .replaceAll(/(?<= - )\*\*\(CVE-\d{4}-\d+\)\*\* (?=\*\*)/g, '') .replaceAll('\\', ''); let expectedNumberOfCommitsLeft = commitList.match(/\n\* \[/g)?.length ?? 0;