renovatebot / renovate

Home of the Renovate CLI: Cross-platform Dependency Automation by Mend.io
https://mend.io/renovate
GNU Affero General Public License v3.0
17.62k stars 2.32k forks source link

Renovate rebases ci bot's commits on its branch #20966

Closed gazpachoking closed 1 year ago

gazpachoking commented 1 year ago

How are you running Renovate?

Mend Renovate hosted app on github.com

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

No response

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

None

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

No response

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

It used to work, and then stopped

Describe the bug

This seems to be a regression that causes #17528 to come back. Starting 3/15/2023 at 2:38 pm eastern, renovate rebased a dependency PR update. Our pre-commit ci bot then ran against this and updated our a requirements.txt based on the new deps and pushed to the branch. Now renovate and pre-commit bots are in an infinite loop updating the same branch. The pre-commit bot is added to our gitIgnoredAuthors renovate option, which up until now has been preventing this from happening.

https://github.com/Flexget/Flexget/pull/3667

Relevant debug logs

Logs ``` Copy/paste the relevant log(s) here, between the starting and ending backticks ```

Have you created a minimal reproduction repository?

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

github-actions[bot] commented 1 year ago

Hi there,

We have found that there's a problem with the logs. Depending on which situation applies follow one, some or all of these instructions.

No logs at all

If you haven't posted any log yet, we need you to find and copy/paste the log into the issue template.

Finding logs on hosted app

Select me to read instructions If you use the Renovate app (GitHub): 1. Go to the affected PR, and search for "View repository job log here" 1. Select the link to go to the "Mend Renovate Dashboard" and log in 1. You are now in the correct repository log overview screen 1. Copy/paste the correct log 1. Follow the steps in the **formatting your logs** section

Finding logs when self-hosting

Select me to read instructions If you're running self-hosted, run with `LOG_LEVEL=debug` in your environment variables and search for whatever dependency/branch/PR that is causing the problem.

Insufficient logs

Select me to read instructions If you already gave us a log, and the Renovate team said it's not enough, then follow the instructions from the **No logs at all** section.

Formatting your logs

Select me to read instructions Please put your logs in a `
` and `` element like this:
Select me to see logs ``` Copy/paste your logs here, between the starting and ending backticks ```
rarkins commented 1 year ago

Logs from one of the runs:

{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"syncBranchState()","time":"2023-03-15T19:03:29.722Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"syncBranchState(): update branchSha","time":"2023-03-15T19:03:29.722Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"getBranchPr(renovate/sqlalchemy-2.x)","time":"2023-03-15T19:03:29.722Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"findPr(renovate/sqlalchemy-2.x, undefined, open)","time":"2023-03-15T19:03:29.722Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Found PR #3667","time":"2023-03-15T19:03:29.722Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"branchExists=true","time":"2023-03-15T19:03:29.723Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"dependencyDashboardCheck=undefined","time":"2023-03-15T19:03:29.723Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"PR rebase requested=false","time":"2023-03-15T19:03:29.723Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Checking if PR has been edited","time":"2023-03-15T19:03:29.723Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"branch.isModified(): using git to calculate","time":"2023-03-15T19:03:29.723Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"branch.isModified() = false","time":"2023-03-15T19:03:29.759Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Found existing branch PR","time":"2023-03-15T19:03:29.759Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Checking schedule(at any time, null)","time":"2023-03-15T19:03:29.759Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"No schedule defined","time":"2023-03-15T19:03:29.759Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Branch already exists","time":"2023-03-15T19:03:29.760Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"getBranchPr(renovate/sqlalchemy-2.x)","time":"2023-03-15T19:03:29.760Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"findPr(renovate/sqlalchemy-2.x, undefined, open)","time":"2023-03-15T19:03:29.760Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Found PR #3667","time":"2023-03-15T19:03:29.760Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Found branch protection","time":"2023-03-15T19:03:29.936Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Skipping behind base branch check due to rebaseWhen=auto","time":"2023-03-15T19:03:29.936Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"isBranchConflicted(develop, renovate/sqlalchemy-2.x)","time":"2023-03-15T19:03:29.936Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"branch.isConflicted(): using git to calculate","time":"2023-03-15T19:03:29.936Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Setting git author name: Renovate Bot","time":"2023-03-15T19:03:29.936Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Setting git author email: bot@renovateapp.com","time":"2023-03-15T19:03:30.022Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"branch.isConflicted(): false","time":"2023-03-15T19:03:31.150Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Branch does not need rebasing","time":"2023-03-15T19:03:31.150Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Using reuseExistingBranch: true","time":"2023-03-15T19:03:31.150Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"Setting current branch to develop","time":"2023-03-15T19:03:31.150Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","branchName":"develop","latestCommitDate":"2023-03-15T15:15:24+00:00","msg":"latest commit","time":"2023-03-15T19:03:31.278Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","msg":"manager.getUpdatedPackageFiles() reuseExistingBranch=true","time":"2023-03-15T19:03:31.324Z"}
{"level":20,"branch":"renovate/sqlalchemy-2.x","packageFile":"pyproject.toml","depName":"sqlalchemy","msg":"Rebasing branch after deps list has changed","time":"2023-03-15T19:03:31.478Z"}
github-actions[bot] commented 1 year ago

Hi there,

Get your issue fixed faster by creating a minimal reproduction. This means a repository dedicated to reproducing this issue with the minimal dependencies and config possible.

Before we start working on your issue we need to know exactly what's causing the current behavior. A minimal reproduction helps us with this.

To get started, please read our guide on creating a minimal reproduction.

We may close the issue if you, or someone else, haven't created a minimal reproduction within two weeks. If you need more time, or are stuck, please ask for help or more time in a comment.

Good luck,

The Renovate team

rarkins commented 1 year ago

Please create a minimal reproduction (instructions above) on github so that we can debug and see if the problem is fixable.

thejan2009 commented 1 year ago

Could this be related to #20906? There it seems the same Rebasing branch after deps list has changed triggers an updated branch push.

renovate-release commented 1 year ago

:tada: This issue has been resolved in version 35.10.2 :tada:

The release is available on:

Your semantic-release bot :package::rocket: