Skip to content

Introduce SYSTEM_SKIP_MERGE_COMMIT_FROM_PR to support Docker build with AZDO pipeline #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Introduce SYSTEM_SKIP_MERGE_COMMIT_FROM_PR to support Docker build with AZDO pipeline #253

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73d9e50
Add a way to skip the call to _getPR in the _getSHA function
luc-ailevate Apr 14, 2025
1e8b6f5
Update AzurePipelines.ts
luc-ailevate Apr 14, 2025
cdf706d
Merge pull request #1 from lucdelsalle/chore/improve-azure-pipeline-m…
luc-ailevate Apr 14, 2025
5217290
Merge branch 'main' into main
luc-ailevate Apr 24, 2025
d0e22d1
Merge branch 'main' into main
luc-ailevate Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/bundler-plugin-core/src/utils/providers/AzurePipelines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down Expand Up @@ -176,5 +177,6 @@ export function getEnvVarNames() {
"SYSTEM_PULLREQUEST_PULLREQUESTNUMBER",
"SYSTEM_TEAMFOUNDATIONSERVERURI",
"SYSTEM_TEAMPROJECT",
"SYSTEM_SKIP_MERGE_COMMIT_FROM_PR",
];
}