fix: idempotency issues when rangeStrategy=update-lockfile is used with other rangeStrategy in the same file

[onigoetz]

Changes:

This change provides a fix for #10050

Since options using postUpdateOptions cause the behaviour of PR updates to be non-deterministic, reuseExistingBranch is set to false when such options are discovered.

This should have no noticeable impact on the number of pushes because the commit won't be made if the content is identical to the previous commit.

Context:

Closes #10050

Documentation (please check one with an [x])

• I have updated the documentation, or
• No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

• Code inspection only, or
• Newly added/modified unit tests, or
• No unit tests but ran on a real repository, or
• Both unit tests + ran on a real repository

The PR from the production renovate is this one : onigoetz/renovate-loop-repro#1 as you can see there are several hundreds force pushes

The PR created by this updated code is : onigoetz/renovate-loop-repro#2
I have run the script three times locally, the first time it created the branch.
the second and third time it output this

DEBUG: 2 file(s) to commit (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
DEBUG: Committing files to branch renovate-test/all-minor-patch (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
DEBUG: git commit (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
       "result": {
         "author": null,
         "branch": "renovate-test/all-minor-patch",
         "commit": "2ae4f4f",
         "root": false,
         "summary": {"changes": 2, "insertions": 28, "deletions": 28}
       }
DEBUG: No file changes detected. Skipping commit (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
       "branchName": "renovate-test/all-minor-patch",
       "fileNames": ["package.json", "yarn.lock"]

Which seem to indicate that everything works as expected now

[onigoetz]

Hi @rarkins @viceice
Is there anything I can do to help get this merged ?
Thanks in advance

[viceice]

Use the re-request review button when you've done all mentioned changes, so we see the PR on our review list

[onigoetz]

oh okay, sure will do that next time 👍

[onigoetz]

I added a second check when two rangeStrategy are used on a single packageFile, when one is update-lockfile.

Here is an example output with this change :

DEBUG: Branch does not need rebasing (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
DEBUG: Detected multiple rangeStrategies along with update-lockfile (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
DEBUG: Using reuseExistingBranch: false (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)

...
DEBUG: Committing files to branch renovate-test/all-minor-patch (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
DEBUG: git commit (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
       "result": {
         "author": null,
         "branch": "renovate-test/all-minor-patch",
         "commit": "30d770d",
         "root": false,
         "summary": {"changes": 2, "insertions": 28, "deletions": 28}
       }
DEBUG: No file changes detected. Skipping commit (repository=onigoetz/renovate-loop-repro, branch=renovate-test/all-minor-patch)
       "branchName": "renovate-test/all-minor-patch",
       "fileNames": ["package.json", "yarn.lock"]

Still on the same test repository : onigoetz/renovate-loop-repro#2 (which now contains a force-push, but that's an actual dependency update)

[rarkins]

It's kinda ugly but we may need to live with it. What do you think @viceice ?

[viceice]

Don't know a better solution for now. 🤔

[renovate-release]

🎉 This PR is included in version 26.21.2 🎉

The release is available on:

• GitHub release
• 26.21.2

Your semantic-release bot 📦🚀