From dca4ad76c1279c437dd63a0d2884df9469f00878 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Thu, 6 Feb 2025 15:58:27 +0100 Subject: [PATCH] make pulId variable --- packages/playwright/src/isomorphic/types.d.ts | 1 - packages/playwright/src/plugins/gitCommitInfoPlugin.ts | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/playwright/src/isomorphic/types.d.ts b/packages/playwright/src/isomorphic/types.d.ts index e6ba20019f..213f350514 100644 --- a/packages/playwright/src/isomorphic/types.d.ts +++ b/packages/playwright/src/isomorphic/types.d.ts @@ -22,7 +22,6 @@ export interface GitCommitInfo { 'revision.timestamp'?: number | Date; 'revision.link'?: string; 'revision.diff'?: string; - 'pull.id'?: string; 'pull.link'?: string; 'pull.diff'?: string; 'pull.base'?: string; diff --git a/packages/playwright/src/plugins/gitCommitInfoPlugin.ts b/packages/playwright/src/plugins/gitCommitInfoPlugin.ts index 1f518584b8..fa7371a57f 100644 --- a/packages/playwright/src/plugins/gitCommitInfoPlugin.ts +++ b/packages/playwright/src/plugins/gitCommitInfoPlugin.ts @@ -60,8 +60,8 @@ function linksFromEnv() { if (process.env.GITHUB_SERVER_URL && process.env.GITHUB_REPOSITORY && process.env.GITHUB_RUN_ID) out['ci.link'] = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`; if (process.env.GITHUB_REF_NAME && process.env.GITHUB_REF_NAME.endsWith('/merge')) { - out['pull.id'] = process.env.GITHUB_REF_NAME.substring(0, process.env.GITHUB_REF_NAME.indexOf('/merge')); - out['pull.link'] = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/pull/${out['pull.id']}`; + const pullId = process.env.GITHUB_REF_NAME.substring(0, process.env.GITHUB_REF_NAME.indexOf('/merge')); + out['pull.link'] = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/pull/${pullId}`; out['pull.base'] = process.env.GITHUB_BASE_REF; } return out;