diff --git a/.github/workflows/docker-test-cont.yml b/.github/workflows/docker-test-cont.yml index be3c207be45aa4..6e18322a2bd428 100644 --- a/.github/workflows/docker-test-cont.yml +++ b/.github/workflows/docker-test-cont.yml @@ -43,11 +43,9 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} script: | const PR = JSON.parse(process.env.PULL_REQUEST) - const body = PR.body const number = PR.number - const sender = PR.user.login const { default: identify } = await import('${{ github.workspace }}/scripts/workflow/test-route/identify.mjs') - return identify({ github, context, core }, body, number, sender) + return identify({ github, context, core }, number) - name: Fetch Docker image if: (env.TEST_CONTINUE) diff --git a/scripts/workflow/test-route/identify.mjs b/scripts/workflow/test-route/identify.mjs index 98b68a9fe17dcc..321d8052781c0a 100644 --- a/scripts/workflow/test-route/identify.mjs +++ b/scripts/workflow/test-route/identify.mjs @@ -2,15 +2,7 @@ const noFound = 'Auto: Route No Found'; const testFailed = 'Auto: Route Test Failed'; const allowedUser = new Set(['dependabot[bot]', 'pull[bot]']); // dependabot and downstream PR requested by pull[bot] -export default async function identify({ github, context, core }, body, number, sender) { - core.debug(`sender: ${sender}`); - core.debug(`body: ${body}`); - // Remove all HTML comments before performing the match - const bodyNoCmts = body?.replaceAll(//g, ''); - const m = bodyNoCmts?.match(/```routes\s+([\S\s]*?)```/); - core.debug(`match: ${m}`); - let routes = null; - +export default async function identify({ github, context, core }, number) { const issueFacts = { owner: context.repo.owner, repo: context.repo.repo, @@ -21,6 +13,22 @@ export default async function identify({ github, context, core }, body, number, repo: context.repo.repo, pull_number: number, }; + const { data: pr } = await github.rest.issues + .get({ + ...issueFacts, + }) + .catch((error) => { + core.warning(error); + }); + const sender = pr.user.login; + const body = pr.body; + core.debug(`sender: ${sender}`); + core.debug(`body: ${body}`); + // Remove all HTML comments before performing the match + const bodyNoCmts = body?.replaceAll(//g, ''); + const m = bodyNoCmts?.match(/```routes\s+([\S\s]*?)```/); + core.debug(`match: ${m}`); + let routes = null; const addLabels = (labels) => github.rest.issues @@ -31,7 +39,6 @@ export default async function identify({ github, context, core }, body, number, .catch((error) => { core.warning(error); }); - const removeLabel = (labelName = noFound) => github.rest.issues .removeLabel({ @@ -41,7 +48,6 @@ export default async function identify({ github, context, core }, body, number, .catch((error) => { core.warning(error); }); - const updatePrState = (state) => github.rest.pulls .update({ @@ -51,7 +57,6 @@ export default async function identify({ github, context, core }, body, number, .catch((error) => { core.warning(error); }); - const createComment = (body) => github.rest.issues .createComment({ @@ -61,7 +66,6 @@ export default async function identify({ github, context, core }, body, number, .catch((error) => { core.warning(error); }); - const createFailedComment = () => { const logUrl = `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`; @@ -74,13 +78,6 @@ export default async function identify({ github, context, core }, body, number, 路由测试失败,请确认评论部分符合格式规范,详情请检查 [日志](${logUrl})。`); }; - const pr = await github.rest.issues - .get({ - ...issueFacts, - }) - .catch((error) => { - core.warning(error); - }); if (pr.pull_request) { if (pr.state === 'closed') { await updatePrState('open');