Skip to content
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.

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

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

Closed
thejan2009 opened this issue Mar 13, 2023 · 2 comments · Fixed by #21005
Closed

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

thejan2009 opened this issue Mar 13, 2023 · 2 comments · Fixed by #21005
Labels
status:requirements Full requirements are not yet known, so implementation should not be started type:bug Bug fix of existing functionality

Comments

@thejan2009
Copy link

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

@thejan2009 thejan2009 added priority-5-triage status:requirements Full requirements are not yet known, so implementation should not be started type:bug Bug fix of existing functionality labels Mar 13, 2023
@rarkins
Copy link
Collaborator

rarkins commented Mar 13, 2023

@rarkins rarkins changed the title inifinte loop on branch automerge with post-upgrade task (v35) branch with post-upgrade task rebases each run (v35) Mar 13, 2023
@renovate-release
Copy link
Collaborator

🎉 This issue has been resolved in version 35.10.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:requirements Full requirements are not yet known, so implementation should not be started type:bug Bug fix of existing functionality
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants