Add a way to skip the call to _getPR in the _getSHA function

luc-ailevate · web-flow · commit 73d9e50fc207 · 2025-04-14T18:32:05.000+02:00
diff --git a/packages/bundler-plugin-core/src/utils/providers/AzurePipelines.ts b/packages/bundler-plugin-core/src/utils/providers/AzurePipelines.ts
@@ -107,8 +107,9 @@ function _getSHA(
   }
 
   let commit = envs?.BUILD_SOURCEVERSION ?? null;
+  const skip_merge_commit_from_pr = Boolean(envs?.SYSTEM_SKIP_MERGE_COMMIT_FROM_PR);
 
-  if (_getPR(inputs, output)) {
+  if (!skip_merge_commit_from_pr && _getPR(inputs, output)) {
     const mergeCommitRegex = /^[a-z0-9]{40} [a-z0-9]{40}$/;
     const mergeCommitMessage = childProcess
       .execFileSync("git", ["show", "--no-patch", "--format=%P"])

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,9 @@ function _getSHA(`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`let commit = envs?.BUILD_SOURCEVERSION ?? null;`
	`110`	`+ const skip_merge_commit_from_pr = Boolean(envs?.SYSTEM_SKIP_MERGE_COMMIT_FROM_PR);`
`110`	`111`
`111`		`- if (_getPR(inputs, output)) {`
	`112`	`+ if (!skip_merge_commit_from_pr && _getPR(inputs, output)) {`
`112`	`113`	`const mergeCommitRegex = /^[a-z0-9]{40} [a-z0-9]{40}$/;`
`113`	`114`	`const mergeCommitMessage = childProcess`
`114`	`115`	`.execFileSync("git", ["show", "--no-patch", "--format=%P"])`