From 6022db50ea1acd76a48cf03e36a909bc762bee56 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 19 Dec 2024 17:58:56 +0100 Subject: [PATCH] fixup! add validation for dont-land labels --- .github/workflows/lint-release-proposal.yml | 2 +- tools/actions/lint-release-proposal-commit-list.mjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-release-proposal.yml b/.github/workflows/lint-release-proposal.yml index 221e81627a8de5..35646b76f96016 100644 --- a/.github/workflows/lint-release-proposal.yml +++ b/.github/workflows/lint-release-proposal.yml @@ -70,6 +70,6 @@ jobs: --jq 'if (.labels|map(.name==env.LABEL)|any) then error("\(.url) has the \(env.LABEL) label, forbidding it to be in this release proposal") end' \ "$PR_URL" > /dev/null done - shell: bash # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option + shell: bash # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option. env: GH_TOKEN: ${{ github.token }} diff --git a/tools/actions/lint-release-proposal-commit-list.mjs b/tools/actions/lint-release-proposal-commit-list.mjs index 74ec4b91f60a8b..3f3aad379529cc 100755 --- a/tools/actions/lint-release-proposal-commit-list.mjs +++ b/tools/actions/lint-release-proposal-commit-list.mjs @@ -38,11 +38,11 @@ for await (const line of stdinLineByLine) { continue; } - const lineStart = commitList.indexOf(`\n* \[[\`${smallSha}\`]`); + const lineStart = commitList.indexOf(`\n* [[\`${smallSha}\`]`); assert.notStrictEqual(lineStart, -1, `Cannot find ${smallSha} on the list`); const lineEnd = commitList.indexOf('\n', lineStart + 1); - const expectedCommitTitle = `${`**${splitTitle.shift()}`.replace('**Revert \"', '_**Revert**_ "**')}**:${splitTitle.join(':')}`; + const expectedCommitTitle = `${`**${splitTitle.shift()}`.replace('**Revert "', '_**Revert**_ "**')}**:${splitTitle.join(':')}`; try { assert(commitList.lastIndexOf(`/${smallSha})] - ${expectedCommitTitle} (`, lineEnd) > lineStart, `Commit title doesn't match`); } catch (e) {