Auto-complete is not reapplied in Azure DevOps after a merge conflict when using automerge #34291
Replies: 1 comment 2 replies
-
|
The logic in createPr() is here: renovate/lib/modules/platform/azure/index.ts Lines 499 to 534 in a2abbaa In updatePr() it's here: renovate/lib/modules/platform/azure/index.ts Lines 589 to 603 in a2abbaa Sounds like the first part from createPr (autocomplete) needs to be done again after a new commit? |
Beta Was this translation helpful? Give feedback.
-
|
That seems like it would fix it. Will you create an issue? Or should I create a PR? |
Beta Was this translation helpful? Give feedback.
-
|
Hi, i'm also willing to offer help. The logic from if (
platformPrOptions?.autoApprove ||
platformPrOptions?.usePlatformAutomerge
) {
const pr = await azureApiGit.getPullRequestById(prNo, config.project);
if (platformPrOptions?.autoApprove) {
await azureApiGit.createPullRequestReviewer(
{
reviewerUrl: pr.createdBy!.url,
vote: AzurePrVote.Approved,
isFlagged: false,
isRequired: false,
},
config.repoId,
// TODO #22198
pr.pullRequestId!,
pr.createdBy!.id!,
);
}
if (platformPrOptions?.usePlatformAutomerge) {
const mergeStrategy =
platformPrOptions.automergeStrategy === 'auto'
? await getMergeStrategy(pr.targetRefName!)
: mapMergeStrategy(platformPrOptions.automergeStrategy);
// TODO #22198
objToUpdate.autoCompleteSetBy = { id: pr.createdBy!.id };
objToUpdate.completionOptions = {
mergeStrategy,
deleteSourceBranch: true,
mergeCommitMessage: title,
};
}
} |
Beta Was this translation helpful? Give feedback.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
How are you running Renovate?
Self-hosted Renovate
If you're self-hosting Renovate, tell us which platform (GitHub, GitLab, etc) and which version of Renovate.
Azure DevOps, custom pipeline
Please tell us more about your question or problem
After running Renovate it might create 2+ PRs for packages that should be automerged. The PRs are set to auto-complete in Azure DevOps and that works as it should. But often some of the PRs will have merge conflicts from one of the other Renovate PRs that completed first. When rerunning Renovate it fixes the merge conflict but doesn't reapply auto-complete, so we have to manually complete the PR.
The PR description contains "Automerge: Enabled." the entire time.
Excerpts from the rerun's debug logs seem to indicate automerge is already enabled and Renovate isn't checking the actual status of the Azure DevOps PR.
Renovate config:
{ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:best-practices", ":automergePatch", ":automergeLinters", ":automergeTesters", ":automergeTypes" ], "autoApprove": true, "prHourlyLimit": 4, "azureWorkItemId": 30372, "packageRules": [ { "extends": ["monorepo:vstest", "monorepo:xunit-dotnet"], "matchPackageNames": ["coverlet.*", "Moq", "NUnit"], "matchManagers": ["nuget"], "automerge": true, "description": "Automerge .NET testing packages" }, { "matchPackageNames": [ "aws-sdk*", "AWSSDK*", "@aws-sdk/**", "boto3", "botocore" ], "groupName": "AWS SDK", "schedule": ["every 4th week on Saturday and Sunday"] }, { "matchPackageNames": ["Amazon.Lambda*"], "matchManagers": ["nuget"], "groupName": ".NET namespace Amazon.Lambda" }, { "matchPackageNames": ["AT.*", "Arkivering.Events*"], "matchManagers": ["nuget"], "groupName": ".NET namespace AT", "description": ".NET packages in the AT namespace or that depend on AT.Common.Core" } ] }Logs (if relevant)
Logs
Beta Was this translation helpful? Give feedback.
All reactions