summaryrefslogtreecommitdiff
path: root/zephyr/test
diff options
context:
space:
mode:
authorAseda Aboagye <aaboagye@google.com>2021-02-01 19:49:48 -0800
committerCommit Bot <commit-bot@chromium.org>2021-02-03 23:31:45 +0000
commit236e03723b4eb389a7846257ac5b6fb9e2faab5c (patch)
tree162abe058f8cfb013bb69dedbd114a37a7061618 /zephyr/test
parent5f46d1c0e957bc294651ae065348ac7ff114fb3a (diff)
downloadchrome-ec-236e03723b4eb389a7846257ac5b6fb9e2faab5c.tar.gz
util: Add update_release_branch.py
This commit adds a script that can be used to update release branches via a merge strategy from the main branch. It leverages the existing `update_release_branch.sh` script, but was rewritten in python and made generic such that it could work with any branch. It also allows baseboards to be specified along with a separate text file that can contain other paths of interest. The default merge strategy is the 'recursive' strategy with the 'theirs' strategy option. The user may provide a different merge strategy using the '-s' and '-X' options. The script can be invoked in the following manner: $ util/update_release_branch.py --baseboard dedede \ --relevant_paths_file util/dedede-relevant-paths.txt \ firmware-dedede-13606.B-master The syntax for the relevant_paths_file is simple. Each path should be own its own line and use the glob syntax that `git log` would expect. Comments may be used with the `#` symbol. BUG=None BRANCH=None TEST=util/update_release_branch.py --baseboard dedede \ --relevant_paths_file util/dedede-relevant-paths.txt \ firmware-dedede-13606.B-master; Verify that merge commit is made and commit message is as expected. Signed-off-by: Aseda Aboagye <aaboagye@google.com> Change-Id: Iedd650104bbe6fd231805cf79aedfdca0bd16dd3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2666675 Tested-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Tom Hughes <tomhughes@chromium.org> Commit-Queue: Aseda Aboagye <aaboagye@chromium.org> Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'zephyr/test')
0 files changed, 0 insertions, 0 deletions