Commit Graph

5 Commits

Author SHA1 Message Date
Xavier Morel
1f8d534c02 [REM] runbot_merge: use of tmp branches during staging
The entire staging process is now done locally with no interaction
with the repo until the staging branches get pushed to.

Removed the backoff / visibility check, as we expect the git repo to
be a "better" reference than the API, and we're now pushing there
directly.
2023-08-23 09:34:28 +02:00
Xavier Morel
879a5d0068 [CHG] runbot_merge: convert rebase-merge and merge to working locally 2023-08-22 15:52:48 +02:00
Xavier Morel
a9b4b373c2 [CHG] runbot_merge: convert rebase-ff staging to working locally
Implemented rebase (-ish?) by hand, following the model of the one
built on the github API, so we have all the information we need *and*
still don't need a local working copy.

Had to update *several* tests due to formatting changes from using the
CLI git (maybe that could be avoided by feeding the commit message
through stdin but w/e).

Also added a dupe of an existing helper for the formatting changes
bit, will have to remove it once all's done.
2023-08-22 14:17:22 +02:00
Xavier Morel
e88e6fed34 [FIX] convert source_url to only include the token
not having to deal with the username is much easier
2023-08-22 08:00:48 +02:00
Xavier Morel
b1f63e52f3 [CHG] *: move repo cache from forwardbot to mergebot
If the stagings are going to be created locally (via a git working
copy rather than the github API), the mergebot part needs to have
access to the cache, so move the cache over. Also move the maintenance
cron.

In an extermely minor way, this prefigures the (hopeful) eventual
merging of the ~~planes~~ modules.
2023-08-16 14:37:28 +02:00