mirror of
https://github.com/odoo/runbot.git
synced 2025-03-15 23:45:44 +07:00
a1384b3868
Previously, runbot_merge assumed github would return commits in topological order (from base to head of PR). However as in the UI github sorts commits using the author's date field, so depending on rebasing/cherrypick/... it's possible to have the head of the commit be "younger" than the rest. In that case robodoo will try to merge it *first*, then attempt to merge the rest on top of it (-ish, it'd probably make a hash of it if that worked), at which point github replies with a 204 (nothing to merge) because the PR head has already included everything which topologically precedes it. Fix: re-sort commits topologically when fetching the PR's log. That way they're rebased in the proper order and correctly linked to one another. Example problematic PR: odoo/enterprise#2794, the commits are 773aef03a59d50b33221d7cdcdf54cd0cbe0c914 author.date: 2018-10-01T14:58:38Z 879547c8dd37e7f413a97393a82f92377785b50b (parent: 773aef03) author.date: 2018-10-01T12:02:08Z Because 879547c8 is "older" than 773aef03, github returns it first, both in the UI and via the API. Also fixed up support for committer & author metadata in fake_github so the local tests would both expose the issue properly and allow fixing it. |
||
|---|---|---|
| runbot | ||
| runbot_cla | ||
| runbot_merge | ||
| .gitignore | ||
| README.md | ||
Odoo Runbot Repository
This repository contains the source code of Odoo testing bot runbot.odoo.com and related addons.
Runbot
The runbot/ directory holds the main runbot Odoo addon.
Runbot CLA addon
The runbot_cla/ directory contains an Odoo addon that checks CLA.