branch with post-upgrade task rebases each run (v35)

[thejan2009]

How are you running Renovate?

Self-hosted

If you're self-hosting Renovate, tell us what version of Renovate you run.

v35

If you're self-hosting Renovate, select which platform you are using.

GitLab self-hosted

If you're self-hosting Renovate, tell us what version of the platform you run.

latest

Was this something which used to work for you, and then stopped?

It used to work, and then stopped

Describe the bug

In one of the projects we set up automerge type branch and there is a postUpdate task that changes some other file inside the repo. Workflow used to be the following

• renovate pushes a branch
• CI pipeline runs in the background
• on next renovate run, it merges the branch if CI succeeded

But since v35 this doesn't happen because

• manager.getUpdatePackageFiles detects changes and creates a new commit with new data generated by postUpdate task
• CI pipeline runs in the background

Below is a minimal reproduction repo that automerges with v34 but not with v35.

https://github.com/thejan2009/renovate-automerge

Relevant debug logs

Logs

DEBUG: manager.getUpdatedPackageFiles() reuseExistingBranch=true (repository=thejan2009/renovate-automerge, branch=renovate/amazon-aws-cli-2.x)
DEBUG: Found a multistage build stage name: deployable (repository=thejan2009/renovate-automerge, branch=renovate/amazon-aws-cli-2.x)
DEBUG: Rebasing branch after deps list has changed (repository=thejan2009/renovate-automerge, packageFile=Dockerfile, branch=renovate/amazon-aws-cli-2.x)
       "depName": "amazon/aws-cli"

... at this point everything gets redone

Have you created a minimal reproduction repository?

I have read the minimal reproductions documentation and linked to such a repository in the bug description

[rarkins]

Reproduction forked to https://github.com/renovate-reproductions/20906

[renovate-release]

🎉 This issue has been resolved in version 35.10.2 🎉

The release is available on:

• GitHub release
• 35.10.2

Your semantic-release bot 📦🚀