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

Auto-merge broken from 31.53.1 #13828

Closed
aablsk opened this issue Jan 26, 2022 · 2 comments · Fixed by #13829
Closed

Auto-merge broken from 31.53.1 #13828

aablsk opened this issue Jan 26, 2022 · 2 comments · Fixed by #13829
Labels
core:automerge Relating to Renovate's automerge capabilities priority-3-medium Default priority, "should be done" but isn't prioritised ahead of others status:in-progress Someone is working on implementation type:bug Bug fix of existing functionality

Comments

@aablsk
Copy link

aablsk commented Jan 26, 2022

How are you running Renovate?

Self-hosted

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

latest

Please select which platform you are using if self-hosting.

Bitbucket Server

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

7.17.4

Describe the bug

Dear renovate team,

thank you for this amazing tool!

Expected:
Renovate auto-merges renovate-branches with successful build.

Actual:
Renovate is unable to auto-merge branches (100% reproduction rate) for all of our projects. This includes gradle-based and npm-based projects with various dependencies being updated.

Supporting information:

  1. We started seeing this problem during our first renovate runs this morning (UTC+1). We run renovate periodically between 8am (UTC+1) and 12 am (UTC+1).
  2. We have been able to identify the release that seems to have broken this functionality for us: 31.53.1 (all following versions have the issue)
  3. Versions before 31.53.0 (including) are working perfectly.

If there's any additional support I can provide, please don't hesitate to contact me!

Thank you for your time and effort!

Best Regards,
Alex

Relevant debug logs

Logs
INFO: Repository started (repository=<project>/<repository>)
       "renovateVersion": "31.53.1"
 INFO: Dependency extraction complete (repository=<project>/<repository>)
       "baseBranch": "master",
       "stats": {
         "managers": {"npm": {"fileCount": 1, "depCount": 26}},
         "total": {"fileCount": 1, "depCount": 26}
       }
 WARN: Unknown error when attempting branch automerge (repository=<project>/<repository>, branch=renovate/chai-4.x)
       "err": {
         "task": {
           "commands": ["merge", "--ff-only", "renovate/chai-4.x"],
           "format": "utf-8",
           "parser": "[function]"
         },
         "message": "merge: renovate/chai-4.x - not something we can merge\n",
         "stack": "Error: merge: renovate/chai-4.x - not something we can merge\n\n    at Object.action (/usr/local/lib/node_modules/renovate/node_modules/simple-git/src/lib/plugins/error-detection.plugin.js:30:33)\n    at PluginStore.exec (/usr/local/lib/node_modules/renovate/node_modules/simple-git/src/lib/plugins/plugin-store.js:21:33)\n    at /usr/local/lib/node_modules/renovate/node_modules/simple-git/src/lib/runners/git-executor-chain.js:95:45\n    at new Promise (<anonymous>)\n    at GitExecutorChain.handleTaskData (/usr/local/lib/node_modules/renovate/node_modules/simple-git/src/lib/runners/git-executor-chain.js:93:16)\n    at GitExecutorChain.<anonymous> (/usr/local/lib/node_modules/renovate/node_modules/simple-git/src/lib/runners/git-executor-chain.js:77:46)\n    at Generator.next (<anonymous>)\n    at fulfilled (/usr/local/lib/node_modules/renovate/node_modules/simple-git/src/lib/runners/git-executor-chain.js:5:58)"
       }
 INFO: PR created (repository=<project>/<repository>, branch=renovate/chai-4.x)
       "pr": 8,
       "prTitle": "Renovate: Update dependency chai to v4.3.5"
 INFO: Comment added (repository=<project>/<repository>, branch=renovate/chai-4.x)
       "prNo": 8,
       "topic": "Branch automerge failure"
 INFO: Repository finished (repository=<project>/<repository>)
       "durationMs": 3367

Have you created a minimal reproduction repository?

No reproduction repository

@aablsk aablsk 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 Jan 26, 2022
@aablsk aablsk changed the title Auto-merge broken from 31.53.0 Auto-merge broken from 31.53.1 Jan 26, 2022
@HonkingGoose HonkingGoose added the core:automerge Relating to Renovate's automerge capabilities label Jan 26, 2022
@HonkingGoose HonkingGoose added priority-3-medium Default priority, "should be done" but isn't prioritised ahead of others status:in-progress Someone is working on implementation and removed priority-5-triage status:requirements Full requirements are not yet known, so implementation should not be started labels Jan 26, 2022
@renovate-release
Copy link
Collaborator

🎉 This issue has been resolved in version 31.57.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@aablsk
Copy link
Author

aablsk commented Jan 26, 2022

Amazingly quick fix! Feature is restored for our organization.

Thank you so much @rarkins @viceice!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
core:automerge Relating to Renovate's automerge capabilities priority-3-medium Default priority, "should be done" but isn't prioritised ahead of others status:in-progress Someone is working on implementation type:bug Bug fix of existing functionality
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants