Skip to content

Commit

Permalink
brancher: support pulling in extra branches
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
kuba-moo committed Nov 30, 2023
1 parent 56a2828 commit ddad9b0
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions trivial-net-brancher.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
[email protected]:linux-netdev/testing.git
branch_pfx=net-next-
freq=3
pull=git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
[output]
branches=branches.json
"""
Expand Down Expand Up @@ -57,6 +58,13 @@ def create_new(config, state, tree, tgt_remote) -> None:
tree.git_reset(tree.branch, hard=True)
log_end_sec()

pull_list = config.get("target", "pull", fallback=None)
if pull_list:
log_open_sec("Pulling in other trees")
for url in pull_list.split(','):
tree.git_pull(url)
log_end_sec()

state["branches"][branch_name] = now.isoformat()

log_open_sec("Pushing out")
Expand Down

0 comments on commit ddad9b0

Please sign in to comment.